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/Dump/Create/meson.build b/gen/xyz/openbmc_project/Dump/Create/meson.build
index d4fd9f3..c30b93c 100644
--- a/gen/xyz/openbmc_project/Dump/Create/meson.build
+++ b/gen/xyz/openbmc_project/Dump/Create/meson.build
@@ -1,8 +1,22 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Dump/Create'
+
generated_sources += custom_target(
'xyz/openbmc_project/Dump/Create__cpp'.underscorify(),
- input: [ '../../../../../yaml/xyz/openbmc_project/Dump/Create.errors.yaml', '../../../../../yaml/xyz/openbmc_project/Dump/Create.interface.yaml', ],
- output: [ 'error.cpp', 'error.hpp', 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../yaml/xyz/openbmc_project/Dump/Create.errors.yaml',
+ '../../../../../yaml/xyz/openbmc_project/Dump/Create.interface.yaml',
+ ],
+ output: [
+ 'error.cpp',
+ 'error.hpp',
+ 'common.hpp',
+ 'server.hpp',
+ 'server.cpp',
+ 'aserver.hpp',
+ 'client.hpp',
+ ],
depend_files: sdbusplusplus_depfiles,
command: [
sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +25,16 @@
'--directory', meson.current_source_dir() / '../../../../../yaml',
'xyz/openbmc_project/Dump/Create',
],
+ install: should_generate_cpp,
+ install_dir: [
+ false,
+ get_option('includedir') / sdbusplus_current_path,
+ 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/Dump/Entry/BMC/meson.build b/gen/xyz/openbmc_project/Dump/Entry/BMC/meson.build
index b58ad6f..0f38d60 100644
--- a/gen/xyz/openbmc_project/Dump/Entry/BMC/meson.build
+++ b/gen/xyz/openbmc_project/Dump/Entry/BMC/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Dump/Entry/BMC'
+
generated_sources += custom_target(
'xyz/openbmc_project/Dump/Entry/BMC__cpp'.underscorify(),
- input: [ '../../../../../../yaml/xyz/openbmc_project/Dump/Entry/BMC.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../../yaml/xyz/openbmc_project/Dump/Entry/BMC.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/Dump/Entry/BMC',
],
+ 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/Dump/Entry/FaultLog/meson.build b/gen/xyz/openbmc_project/Dump/Entry/FaultLog/meson.build
index 08a8cbf..2dc42f7 100644
--- a/gen/xyz/openbmc_project/Dump/Entry/FaultLog/meson.build
+++ b/gen/xyz/openbmc_project/Dump/Entry/FaultLog/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Dump/Entry/FaultLog'
+
generated_sources += custom_target(
'xyz/openbmc_project/Dump/Entry/FaultLog__cpp'.underscorify(),
- input: [ '../../../../../../yaml/xyz/openbmc_project/Dump/Entry/FaultLog.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../../yaml/xyz/openbmc_project/Dump/Entry/FaultLog.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/Dump/Entry/FaultLog',
],
+ 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/Dump/Entry/NIC/meson.build b/gen/xyz/openbmc_project/Dump/Entry/NIC/meson.build
index 2843d91..999351e 100644
--- a/gen/xyz/openbmc_project/Dump/Entry/NIC/meson.build
+++ b/gen/xyz/openbmc_project/Dump/Entry/NIC/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Dump/Entry/NIC'
+
generated_sources += custom_target(
'xyz/openbmc_project/Dump/Entry/NIC__cpp'.underscorify(),
- input: [ '../../../../../../yaml/xyz/openbmc_project/Dump/Entry/NIC.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../../yaml/xyz/openbmc_project/Dump/Entry/NIC.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/Dump/Entry/NIC',
],
+ 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/Dump/Entry/System/meson.build b/gen/xyz/openbmc_project/Dump/Entry/System/meson.build
index 435cb48..b8261bc 100644
--- a/gen/xyz/openbmc_project/Dump/Entry/System/meson.build
+++ b/gen/xyz/openbmc_project/Dump/Entry/System/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Dump/Entry/System'
+
generated_sources += custom_target(
'xyz/openbmc_project/Dump/Entry/System__cpp'.underscorify(),
- input: [ '../../../../../../yaml/xyz/openbmc_project/Dump/Entry/System.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../../yaml/xyz/openbmc_project/Dump/Entry/System.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/Dump/Entry/System',
],
+ 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/Dump/Entry/meson.build b/gen/xyz/openbmc_project/Dump/Entry/meson.build
index 570e83d..890e456 100644
--- a/gen/xyz/openbmc_project/Dump/Entry/meson.build
+++ b/gen/xyz/openbmc_project/Dump/Entry/meson.build
@@ -1,8 +1,23 @@
# Generated file; do not modify.
+subdir('BMC')
+subdir('FaultLog')
+subdir('NIC')
+subdir('System')
+
+sdbusplus_current_path = 'xyz/openbmc_project/Dump/Entry'
+
generated_sources += custom_target(
'xyz/openbmc_project/Dump/Entry__cpp'.underscorify(),
- input: [ '../../../../../yaml/xyz/openbmc_project/Dump/Entry.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../yaml/xyz/openbmc_project/Dump/Entry.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,10 +26,18 @@
'--directory', meson.current_source_dir() / '../../../../../yaml',
'xyz/openbmc_project/Dump/Entry',
],
+ 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,
)
-subdir('BMC')
-generated_others += custom_target(
+generated_markdown += custom_target(
'xyz/openbmc_project/Dump/Entry/BMC__markdown'.underscorify(),
input: [ '../../../../../yaml/xyz/openbmc_project/Dump/Entry/BMC.interface.yaml', ],
output: [ 'BMC.md' ],
@@ -26,10 +49,12 @@
'--directory', meson.current_source_dir() / '../../../../../yaml',
'xyz/openbmc_project/Dump/Entry/BMC',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)
-subdir('FaultLog')
-generated_others += custom_target(
+generated_markdown += custom_target(
'xyz/openbmc_project/Dump/Entry/FaultLog__markdown'.underscorify(),
input: [ '../../../../../yaml/xyz/openbmc_project/Dump/Entry/FaultLog.interface.yaml', ],
output: [ 'FaultLog.md' ],
@@ -41,10 +66,12 @@
'--directory', meson.current_source_dir() / '../../../../../yaml',
'xyz/openbmc_project/Dump/Entry/FaultLog',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)
-subdir('NIC')
-generated_others += custom_target(
+generated_markdown += custom_target(
'xyz/openbmc_project/Dump/Entry/NIC__markdown'.underscorify(),
input: [ '../../../../../yaml/xyz/openbmc_project/Dump/Entry/NIC.interface.yaml', ],
output: [ 'NIC.md' ],
@@ -56,10 +83,12 @@
'--directory', meson.current_source_dir() / '../../../../../yaml',
'xyz/openbmc_project/Dump/Entry/NIC',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)
-subdir('System')
-generated_others += custom_target(
+generated_markdown += custom_target(
'xyz/openbmc_project/Dump/Entry/System__markdown'.underscorify(),
input: [ '../../../../../yaml/xyz/openbmc_project/Dump/Entry/System.interface.yaml', ],
output: [ 'System.md' ],
@@ -71,5 +100,8 @@
'--directory', meson.current_source_dir() / '../../../../../yaml',
'xyz/openbmc_project/Dump/Entry/System',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)
diff --git a/gen/xyz/openbmc_project/Dump/NewDump/meson.build b/gen/xyz/openbmc_project/Dump/NewDump/meson.build
index eba978f..813f43e 100644
--- a/gen/xyz/openbmc_project/Dump/NewDump/meson.build
+++ b/gen/xyz/openbmc_project/Dump/NewDump/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Dump/NewDump'
+
generated_sources += custom_target(
'xyz/openbmc_project/Dump/NewDump__cpp'.underscorify(),
- input: [ '../../../../../yaml/xyz/openbmc_project/Dump/NewDump.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../yaml/xyz/openbmc_project/Dump/NewDump.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/Dump/NewDump',
],
+ 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/Dump/meson.build b/gen/xyz/openbmc_project/Dump/meson.build
index b6fb4aa..cd18961 100644
--- a/gen/xyz/openbmc_project/Dump/meson.build
+++ b/gen/xyz/openbmc_project/Dump/meson.build
@@ -1,6 +1,11 @@
# Generated file; do not modify.
subdir('Create')
-generated_others += custom_target(
+subdir('Entry')
+subdir('NewDump')
+
+sdbusplus_current_path = 'xyz/openbmc_project/Dump'
+
+generated_markdown += custom_target(
'xyz/openbmc_project/Dump/Create__markdown'.underscorify(),
input: [ '../../../../yaml/xyz/openbmc_project/Dump/Create.errors.yaml', '../../../../yaml/xyz/openbmc_project/Dump/Create.interface.yaml', ],
output: [ 'Create.md' ],
@@ -12,10 +17,12 @@
'--directory', meson.current_source_dir() / '../../../../yaml',
'xyz/openbmc_project/Dump/Create',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)
-subdir('Entry')
-generated_others += custom_target(
+generated_markdown += custom_target(
'xyz/openbmc_project/Dump/Entry__markdown'.underscorify(),
input: [ '../../../../yaml/xyz/openbmc_project/Dump/Entry.interface.yaml', ],
output: [ 'Entry.md' ],
@@ -27,10 +34,12 @@
'--directory', meson.current_source_dir() / '../../../../yaml',
'xyz/openbmc_project/Dump/Entry',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)
-subdir('NewDump')
-generated_others += custom_target(
+generated_markdown += custom_target(
'xyz/openbmc_project/Dump/NewDump__markdown'.underscorify(),
input: [ '../../../../yaml/xyz/openbmc_project/Dump/NewDump.interface.yaml', ],
output: [ 'NewDump.md' ],
@@ -42,5 +51,8 @@
'--directory', meson.current_source_dir() / '../../../../yaml',
'xyz/openbmc_project/Dump/NewDump',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)