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/com/ibm/VPD/Collection/meson.build b/gen/com/ibm/VPD/Collection/meson.build
index 24c8c99..1f93fce 100644
--- a/gen/com/ibm/VPD/Collection/meson.build
+++ b/gen/com/ibm/VPD/Collection/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'com/ibm/VPD/Collection'
+
generated_sources += custom_target(
'com/ibm/VPD/Collection__cpp'.underscorify(),
- input: [ '../../../../../yaml/com/ibm/VPD/Collection.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../yaml/com/ibm/VPD/Collection.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',
'com/ibm/VPD/Collection',
],
+ 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/com/ibm/VPD/Manager/meson.build b/gen/com/ibm/VPD/Manager/meson.build
index 026669d..6451f3e 100644
--- a/gen/com/ibm/VPD/Manager/meson.build
+++ b/gen/com/ibm/VPD/Manager/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'com/ibm/VPD/Manager'
+
generated_sources += custom_target(
'com/ibm/VPD/Manager__cpp'.underscorify(),
- input: [ '../../../../../yaml/com/ibm/VPD/Manager.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../yaml/com/ibm/VPD/Manager.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',
'com/ibm/VPD/Manager',
],
+ 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/com/ibm/VPD/meson.build b/gen/com/ibm/VPD/meson.build
index 5ff46d9..c9c401f 100644
--- a/gen/com/ibm/VPD/meson.build
+++ b/gen/com/ibm/VPD/meson.build
@@ -1,8 +1,18 @@
# Generated file; do not modify.
+subdir('Collection')
+subdir('Manager')
+
+sdbusplus_current_path = 'com/ibm/VPD'
+
generated_sources += custom_target(
'com/ibm/VPD__cpp'.underscorify(),
- input: [ '../../../../yaml/com/ibm/VPD.errors.yaml', ],
- output: [ 'error.cpp', 'error.hpp', ],
+ input: [
+ '../../../../yaml/com/ibm/VPD.errors.yaml',
+ ],
+ output: [
+ 'error.cpp',
+ 'error.hpp',
+ ],
depend_files: sdbusplusplus_depfiles,
command: [
sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,10 +21,15 @@
'--directory', meson.current_source_dir() / '../../../../yaml',
'com/ibm/VPD',
],
+ install: should_generate_cpp,
+ install_dir: [
+ false,
+ get_option('includedir') / sdbusplus_current_path,
+ ],
+ build_by_default: should_generate_cpp,
)
-subdir('Collection')
-generated_others += custom_target(
+generated_markdown += custom_target(
'com/ibm/VPD/Collection__markdown'.underscorify(),
input: [ '../../../../yaml/com/ibm/VPD/Collection.interface.yaml', ],
output: [ 'Collection.md' ],
@@ -26,10 +41,12 @@
'--directory', meson.current_source_dir() / '../../../../yaml',
'com/ibm/VPD/Collection',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)
-subdir('Manager')
-generated_others += custom_target(
+generated_markdown += custom_target(
'com/ibm/VPD/Manager__markdown'.underscorify(),
input: [ '../../../../yaml/com/ibm/VPD/Manager.interface.yaml', ],
output: [ 'Manager.md' ],
@@ -41,5 +58,8 @@
'--directory', meson.current_source_dir() / '../../../../yaml',
'com/ibm/VPD/Manager',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)