metric: rename from metrics
Generally use non-plural names. Do a trivial rename of the Metric
definitions before they start being used by applications.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ia0f210684c8aa0f567d5a1d70baf7eb8956b8712
diff --git a/gen/xyz/openbmc_project/Metrics/Reset/meson.build b/gen/xyz/openbmc_project/Metric/Reset/meson.build
similarity index 69%
rename from gen/xyz/openbmc_project/Metrics/Reset/meson.build
rename to gen/xyz/openbmc_project/Metric/Reset/meson.build
index 529390d..09fee53 100644
--- a/gen/xyz/openbmc_project/Metrics/Reset/meson.build
+++ b/gen/xyz/openbmc_project/Metric/Reset/meson.build
@@ -1,7 +1,7 @@
# Generated file; do not modify.
generated_sources += custom_target(
- 'xyz/openbmc_project/Metrics/Reset__cpp'.underscorify(),
- input: [ '../../../../../yaml/xyz/openbmc_project/Metrics/Reset.interface.yaml', ],
+ 'xyz/openbmc_project/Metric/Reset__cpp'.underscorify(),
+ input: [ '../../../../../yaml/xyz/openbmc_project/Metric/Reset.interface.yaml', ],
output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
depend_files: sdbusplusplus_depfiles,
command: [
@@ -9,7 +9,7 @@
'--output', meson.current_build_dir(),
'--tool', sdbusplusplus_prog,
'--directory', meson.current_source_dir() / '../../../../../yaml',
- 'xyz/openbmc_project/Metrics/Reset',
+ 'xyz/openbmc_project/Metric/Reset',
],
)
diff --git a/gen/xyz/openbmc_project/Metrics/Reset/meson.build b/gen/xyz/openbmc_project/Metric/Value/meson.build
similarity index 69%
copy from gen/xyz/openbmc_project/Metrics/Reset/meson.build
copy to gen/xyz/openbmc_project/Metric/Value/meson.build
index 529390d..0bbd00d 100644
--- a/gen/xyz/openbmc_project/Metrics/Reset/meson.build
+++ b/gen/xyz/openbmc_project/Metric/Value/meson.build
@@ -1,7 +1,7 @@
# Generated file; do not modify.
generated_sources += custom_target(
- 'xyz/openbmc_project/Metrics/Reset__cpp'.underscorify(),
- input: [ '../../../../../yaml/xyz/openbmc_project/Metrics/Reset.interface.yaml', ],
+ 'xyz/openbmc_project/Metric/Value__cpp'.underscorify(),
+ input: [ '../../../../../yaml/xyz/openbmc_project/Metric/Value.interface.yaml', ],
output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
depend_files: sdbusplusplus_depfiles,
command: [
@@ -9,7 +9,7 @@
'--output', meson.current_build_dir(),
'--tool', sdbusplusplus_prog,
'--directory', meson.current_source_dir() / '../../../../../yaml',
- 'xyz/openbmc_project/Metrics/Reset',
+ 'xyz/openbmc_project/Metric/Value',
],
)
diff --git a/gen/xyz/openbmc_project/Metrics/meson.build b/gen/xyz/openbmc_project/Metric/meson.build
similarity index 65%
rename from gen/xyz/openbmc_project/Metrics/meson.build
rename to gen/xyz/openbmc_project/Metric/meson.build
index b780e50..69099b9 100644
--- a/gen/xyz/openbmc_project/Metrics/meson.build
+++ b/gen/xyz/openbmc_project/Metric/meson.build
@@ -1,8 +1,8 @@
# Generated file; do not modify.
subdir('Reset')
generated_others += custom_target(
- 'xyz/openbmc_project/Metrics/Reset__markdown'.underscorify(),
- input: [ '../../../../yaml/xyz/openbmc_project/Metrics/Reset.interface.yaml', ],
+ 'xyz/openbmc_project/Metric/Reset__markdown'.underscorify(),
+ input: [ '../../../../yaml/xyz/openbmc_project/Metric/Reset.interface.yaml', ],
output: [ 'Reset.md' ],
depend_files: sdbusplusplus_depfiles,
command: [
@@ -10,14 +10,14 @@
'--output', meson.current_build_dir(),
'--tool', sdbusplusplus_prog,
'--directory', meson.current_source_dir() / '../../../../yaml',
- 'xyz/openbmc_project/Metrics/Reset',
+ 'xyz/openbmc_project/Metric/Reset',
],
)
subdir('Value')
generated_others += custom_target(
- 'xyz/openbmc_project/Metrics/Value__markdown'.underscorify(),
- input: [ '../../../../yaml/xyz/openbmc_project/Metrics/Value.interface.yaml', ],
+ 'xyz/openbmc_project/Metric/Value__markdown'.underscorify(),
+ input: [ '../../../../yaml/xyz/openbmc_project/Metric/Value.interface.yaml', ],
output: [ 'Value.md' ],
depend_files: sdbusplusplus_depfiles,
command: [
@@ -25,7 +25,7 @@
'--output', meson.current_build_dir(),
'--tool', sdbusplusplus_prog,
'--directory', meson.current_source_dir() / '../../../../yaml',
- 'xyz/openbmc_project/Metrics/Value',
+ 'xyz/openbmc_project/Metric/Value',
],
)
diff --git a/gen/xyz/openbmc_project/Metrics/Value/meson.build b/gen/xyz/openbmc_project/Metrics/Value/meson.build
deleted file mode 100644
index f22b1f2..0000000
--- a/gen/xyz/openbmc_project/Metrics/Value/meson.build
+++ /dev/null
@@ -1,15 +0,0 @@
-# Generated file; do not modify.
-generated_sources += custom_target(
- 'xyz/openbmc_project/Metrics/Value__cpp'.underscorify(),
- input: [ '../../../../../yaml/xyz/openbmc_project/Metrics/Value.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
- depend_files: sdbusplusplus_depfiles,
- command: [
- sdbuspp_gen_meson_prog, '--command', 'cpp',
- '--output', meson.current_build_dir(),
- '--tool', sdbusplusplus_prog,
- '--directory', meson.current_source_dir() / '../../../../../yaml',
- 'xyz/openbmc_project/Metrics/Value',
- ],
-)
-
diff --git a/gen/xyz/openbmc_project/meson.build b/gen/xyz/openbmc_project/meson.build
index 573a389..b30b985 100644
--- a/gen/xyz/openbmc_project/meson.build
+++ b/gen/xyz/openbmc_project/meson.build
@@ -88,7 +88,7 @@
subdir('Logging')
subdir('MCTP')
subdir('Memory')
-subdir('Metrics')
+subdir('Metric')
subdir('Network')
subdir('Nvme')
subdir('Object')
diff --git a/yaml/xyz/openbmc_project/Metrics/Reset.interface.yaml b/yaml/xyz/openbmc_project/Metric/Reset.interface.yaml
similarity index 100%
rename from yaml/xyz/openbmc_project/Metrics/Reset.interface.yaml
rename to yaml/xyz/openbmc_project/Metric/Reset.interface.yaml
diff --git a/yaml/xyz/openbmc_project/Metrics/Value.interface.yaml b/yaml/xyz/openbmc_project/Metric/Value.interface.yaml
similarity index 100%
rename from yaml/xyz/openbmc_project/Metrics/Value.interface.yaml
rename to yaml/xyz/openbmc_project/Metric/Value.interface.yaml