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/Dump/Create/meson.build b/gen/com/ibm/Dump/Create/meson.build
index 7033ff3..ce6bbd7 100644
--- a/gen/com/ibm/Dump/Create/meson.build
+++ b/gen/com/ibm/Dump/Create/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'com/ibm/Dump/Create'
+
generated_sources += custom_target(
'com/ibm/Dump/Create__cpp'.underscorify(),
- input: [ '../../../../../yaml/com/ibm/Dump/Create.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../yaml/com/ibm/Dump/Create.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/Dump/Create',
],
+ 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/Dump/Entry/Hardware/meson.build b/gen/com/ibm/Dump/Entry/Hardware/meson.build
index 43cbbff..9eb9633 100644
--- a/gen/com/ibm/Dump/Entry/Hardware/meson.build
+++ b/gen/com/ibm/Dump/Entry/Hardware/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'com/ibm/Dump/Entry/Hardware'
+
generated_sources += custom_target(
'com/ibm/Dump/Entry/Hardware__cpp'.underscorify(),
- input: [ '../../../../../../yaml/com/ibm/Dump/Entry/Hardware.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../../yaml/com/ibm/Dump/Entry/Hardware.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/Dump/Entry/Hardware',
],
+ 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/Dump/Entry/Hostboot/meson.build b/gen/com/ibm/Dump/Entry/Hostboot/meson.build
index ea8feae..9c9669c 100644
--- a/gen/com/ibm/Dump/Entry/Hostboot/meson.build
+++ b/gen/com/ibm/Dump/Entry/Hostboot/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'com/ibm/Dump/Entry/Hostboot'
+
generated_sources += custom_target(
'com/ibm/Dump/Entry/Hostboot__cpp'.underscorify(),
- input: [ '../../../../../../yaml/com/ibm/Dump/Entry/Hostboot.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../../yaml/com/ibm/Dump/Entry/Hostboot.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/Dump/Entry/Hostboot',
],
+ 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/Dump/Entry/Resource/meson.build b/gen/com/ibm/Dump/Entry/Resource/meson.build
index cb3ed0b..906c4b7 100644
--- a/gen/com/ibm/Dump/Entry/Resource/meson.build
+++ b/gen/com/ibm/Dump/Entry/Resource/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'com/ibm/Dump/Entry/Resource'
+
generated_sources += custom_target(
'com/ibm/Dump/Entry/Resource__cpp'.underscorify(),
- input: [ '../../../../../../yaml/com/ibm/Dump/Entry/Resource.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../../yaml/com/ibm/Dump/Entry/Resource.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/Dump/Entry/Resource',
],
+ 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/Dump/Entry/SBE/meson.build b/gen/com/ibm/Dump/Entry/SBE/meson.build
index 859fc6c..659c539 100644
--- a/gen/com/ibm/Dump/Entry/SBE/meson.build
+++ b/gen/com/ibm/Dump/Entry/SBE/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'com/ibm/Dump/Entry/SBE'
+
generated_sources += custom_target(
'com/ibm/Dump/Entry/SBE__cpp'.underscorify(),
- input: [ '../../../../../../yaml/com/ibm/Dump/Entry/SBE.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../../yaml/com/ibm/Dump/Entry/SBE.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/Dump/Entry/SBE',
],
+ 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/Dump/Entry/meson.build b/gen/com/ibm/Dump/Entry/meson.build
index 4f7ea25..c3fad5f 100644
--- a/gen/com/ibm/Dump/Entry/meson.build
+++ b/gen/com/ibm/Dump/Entry/meson.build
@@ -1,6 +1,12 @@
# Generated file; do not modify.
subdir('Hardware')
-generated_others += custom_target(
+subdir('Hostboot')
+subdir('Resource')
+subdir('SBE')
+
+sdbusplus_current_path = 'com/ibm/Dump/Entry'
+
+generated_markdown += custom_target(
'com/ibm/Dump/Entry/Hardware__markdown'.underscorify(),
input: [ '../../../../../yaml/com/ibm/Dump/Entry/Hardware.interface.yaml', ],
output: [ 'Hardware.md' ],
@@ -12,10 +18,12 @@
'--directory', meson.current_source_dir() / '../../../../../yaml',
'com/ibm/Dump/Entry/Hardware',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)
-subdir('Hostboot')
-generated_others += custom_target(
+generated_markdown += custom_target(
'com/ibm/Dump/Entry/Hostboot__markdown'.underscorify(),
input: [ '../../../../../yaml/com/ibm/Dump/Entry/Hostboot.interface.yaml', ],
output: [ 'Hostboot.md' ],
@@ -27,10 +35,12 @@
'--directory', meson.current_source_dir() / '../../../../../yaml',
'com/ibm/Dump/Entry/Hostboot',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)
-subdir('Resource')
-generated_others += custom_target(
+generated_markdown += custom_target(
'com/ibm/Dump/Entry/Resource__markdown'.underscorify(),
input: [ '../../../../../yaml/com/ibm/Dump/Entry/Resource.interface.yaml', ],
output: [ 'Resource.md' ],
@@ -42,10 +52,12 @@
'--directory', meson.current_source_dir() / '../../../../../yaml',
'com/ibm/Dump/Entry/Resource',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)
-subdir('SBE')
-generated_others += custom_target(
+generated_markdown += custom_target(
'com/ibm/Dump/Entry/SBE__markdown'.underscorify(),
input: [ '../../../../../yaml/com/ibm/Dump/Entry/SBE.interface.yaml', ],
output: [ 'SBE.md' ],
@@ -57,5 +69,8 @@
'--directory', meson.current_source_dir() / '../../../../../yaml',
'com/ibm/Dump/Entry/SBE',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)
diff --git a/gen/com/ibm/Dump/Notify/meson.build b/gen/com/ibm/Dump/Notify/meson.build
index 063dc38..e762d4c 100644
--- a/gen/com/ibm/Dump/Notify/meson.build
+++ b/gen/com/ibm/Dump/Notify/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'com/ibm/Dump/Notify'
+
generated_sources += custom_target(
'com/ibm/Dump/Notify__cpp'.underscorify(),
- input: [ '../../../../../yaml/com/ibm/Dump/Notify.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../yaml/com/ibm/Dump/Notify.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/Dump/Notify',
],
+ 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/Dump/meson.build b/gen/com/ibm/Dump/meson.build
index 69fd81b..9e93b59 100644
--- a/gen/com/ibm/Dump/meson.build
+++ b/gen/com/ibm/Dump/meson.build
@@ -1,6 +1,11 @@
# Generated file; do not modify.
subdir('Create')
-generated_others += custom_target(
+subdir('Entry')
+subdir('Notify')
+
+sdbusplus_current_path = 'com/ibm/Dump'
+
+generated_markdown += custom_target(
'com/ibm/Dump/Create__markdown'.underscorify(),
input: [ '../../../../yaml/com/ibm/Dump/Create.interface.yaml', ],
output: [ 'Create.md' ],
@@ -12,11 +17,12 @@
'--directory', meson.current_source_dir() / '../../../../yaml',
'com/ibm/Dump/Create',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)
-subdir('Entry')
-subdir('Notify')
-generated_others += custom_target(
+generated_markdown += custom_target(
'com/ibm/Dump/Notify__markdown'.underscorify(),
input: [ '../../../../yaml/com/ibm/Dump/Notify.interface.yaml', ],
output: [ 'Notify.md' ],
@@ -28,5 +34,8 @@
'--directory', meson.current_source_dir() / '../../../../yaml',
'com/ibm/Dump/Notify',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)