build: support registry generation
sdbus++-gen-meson version 10 adds support for redfish registry
generation and greatly simplifies the install directives.
Regenerate the YAML meson files and modify the base meson.build
as necessary. Also, format meson.build with `meson format`.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I77586fca7742d5468803913cb45276ca57271655
diff --git a/gen/xyz/openbmc_project/Object/Delete/meson.build b/gen/xyz/openbmc_project/Object/Delete/meson.build
index ae08ba9..af01f66 100644
--- a/gen/xyz/openbmc_project/Object/Delete/meson.build
+++ b/gen/xyz/openbmc_project/Object/Delete/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Object/Delete'
+
generated_sources += custom_target(
'xyz/openbmc_project/Object/Delete__cpp'.underscorify(),
- input: [ '../../../../../yaml/xyz/openbmc_project/Object/Delete.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../yaml/xyz/openbmc_project/Object/Delete.interface.yaml',
+ ],
+ output: [
+ 'common.hpp',
+ 'server.hpp',
+ 'server.cpp',
+ 'aserver.hpp',
+ 'client.hpp',
+ ],
depend_files: sdbusplusplus_depfiles,
command: [
sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +22,14 @@
'--directory', meson.current_source_dir() / '../../../../../yaml',
'xyz/openbmc_project/Object/Delete',
],
+ install: should_generate_cpp,
+ install_dir: [
+ get_option('includedir') / sdbusplus_current_path,
+ get_option('includedir') / sdbusplus_current_path,
+ false,
+ get_option('includedir') / sdbusplus_current_path,
+ get_option('includedir') / sdbusplus_current_path,
+ ],
+ build_by_default: should_generate_cpp,
)
diff --git a/gen/xyz/openbmc_project/Object/Enable/meson.build b/gen/xyz/openbmc_project/Object/Enable/meson.build
index bb9aa48..1ed3b20 100644
--- a/gen/xyz/openbmc_project/Object/Enable/meson.build
+++ b/gen/xyz/openbmc_project/Object/Enable/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Object/Enable'
+
generated_sources += custom_target(
'xyz/openbmc_project/Object/Enable__cpp'.underscorify(),
- input: [ '../../../../../yaml/xyz/openbmc_project/Object/Enable.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../yaml/xyz/openbmc_project/Object/Enable.interface.yaml',
+ ],
+ output: [
+ 'common.hpp',
+ 'server.hpp',
+ 'server.cpp',
+ 'aserver.hpp',
+ 'client.hpp',
+ ],
depend_files: sdbusplusplus_depfiles,
command: [
sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +22,14 @@
'--directory', meson.current_source_dir() / '../../../../../yaml',
'xyz/openbmc_project/Object/Enable',
],
+ install: should_generate_cpp,
+ install_dir: [
+ get_option('includedir') / sdbusplus_current_path,
+ get_option('includedir') / sdbusplus_current_path,
+ false,
+ get_option('includedir') / sdbusplus_current_path,
+ get_option('includedir') / sdbusplus_current_path,
+ ],
+ build_by_default: should_generate_cpp,
)
diff --git a/gen/xyz/openbmc_project/Object/meson.build b/gen/xyz/openbmc_project/Object/meson.build
index 0bf2fbc..d4db733 100644
--- a/gen/xyz/openbmc_project/Object/meson.build
+++ b/gen/xyz/openbmc_project/Object/meson.build
@@ -1,6 +1,10 @@
# Generated file; do not modify.
subdir('Delete')
-generated_others += custom_target(
+subdir('Enable')
+
+sdbusplus_current_path = 'xyz/openbmc_project/Object'
+
+generated_markdown += custom_target(
'xyz/openbmc_project/Object/Delete__markdown'.underscorify(),
input: [ '../../../../yaml/xyz/openbmc_project/Object/Delete.interface.yaml', ],
output: [ 'Delete.md' ],
@@ -12,10 +16,12 @@
'--directory', meson.current_source_dir() / '../../../../yaml',
'xyz/openbmc_project/Object/Delete',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)
-subdir('Enable')
-generated_others += custom_target(
+generated_markdown += custom_target(
'xyz/openbmc_project/Object/Enable__markdown'.underscorify(),
input: [ '../../../../yaml/xyz/openbmc_project/Object/Enable.interface.yaml', ],
output: [ 'Enable.md' ],
@@ -27,5 +33,8 @@
'--directory', meson.current_source_dir() / '../../../../yaml',
'xyz/openbmc_project/Object/Enable',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)