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/Certs/Authority/meson.build b/gen/xyz/openbmc_project/Certs/Authority/meson.build
index 578f8ec..24aab6b 100644
--- a/gen/xyz/openbmc_project/Certs/Authority/meson.build
+++ b/gen/xyz/openbmc_project/Certs/Authority/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Certs/Authority'
+
generated_sources += custom_target(
'xyz/openbmc_project/Certs/Authority__cpp'.underscorify(),
- input: [ '../../../../../yaml/xyz/openbmc_project/Certs/Authority.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../yaml/xyz/openbmc_project/Certs/Authority.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/Certs/Authority',
],
+ 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/Certs/CSR/Create/meson.build b/gen/xyz/openbmc_project/Certs/CSR/Create/meson.build
index d4f3842..b7f5eb5 100644
--- a/gen/xyz/openbmc_project/Certs/CSR/Create/meson.build
+++ b/gen/xyz/openbmc_project/Certs/CSR/Create/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Certs/CSR/Create'
+
generated_sources += custom_target(
'xyz/openbmc_project/Certs/CSR/Create__cpp'.underscorify(),
- input: [ '../../../../../../yaml/xyz/openbmc_project/Certs/CSR/Create.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../../yaml/xyz/openbmc_project/Certs/CSR/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',
'xyz/openbmc_project/Certs/CSR/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/xyz/openbmc_project/Certs/CSR/meson.build b/gen/xyz/openbmc_project/Certs/CSR/meson.build
index 0d2bf9b..2c6a795 100644
--- a/gen/xyz/openbmc_project/Certs/CSR/meson.build
+++ b/gen/xyz/openbmc_project/Certs/CSR/meson.build
@@ -1,8 +1,20 @@
# Generated file; do not modify.
+subdir('Create')
+
+sdbusplus_current_path = 'xyz/openbmc_project/Certs/CSR'
+
generated_sources += custom_target(
'xyz/openbmc_project/Certs/CSR__cpp'.underscorify(),
- input: [ '../../../../../yaml/xyz/openbmc_project/Certs/CSR.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../yaml/xyz/openbmc_project/Certs/CSR.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 +23,18 @@
'--directory', meson.current_source_dir() / '../../../../../yaml',
'xyz/openbmc_project/Certs/CSR',
],
+ 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('Create')
-generated_others += custom_target(
+generated_markdown += custom_target(
'xyz/openbmc_project/Certs/CSR/Create__markdown'.underscorify(),
input: [ '../../../../../yaml/xyz/openbmc_project/Certs/CSR/Create.interface.yaml', ],
output: [ 'Create.md' ],
@@ -26,5 +46,8 @@
'--directory', meson.current_source_dir() / '../../../../../yaml',
'xyz/openbmc_project/Certs/CSR/Create',
],
+ 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/Certs/Certificate/meson.build b/gen/xyz/openbmc_project/Certs/Certificate/meson.build
index e9fb0a1..cd85e76 100644
--- a/gen/xyz/openbmc_project/Certs/Certificate/meson.build
+++ b/gen/xyz/openbmc_project/Certs/Certificate/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Certs/Certificate'
+
generated_sources += custom_target(
'xyz/openbmc_project/Certs/Certificate__cpp'.underscorify(),
- input: [ '../../../../../yaml/xyz/openbmc_project/Certs/Certificate.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../yaml/xyz/openbmc_project/Certs/Certificate.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/Certs/Certificate',
],
+ 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/Certs/Entry/meson.build b/gen/xyz/openbmc_project/Certs/Entry/meson.build
index cdedd74..65baf6e 100644
--- a/gen/xyz/openbmc_project/Certs/Entry/meson.build
+++ b/gen/xyz/openbmc_project/Certs/Entry/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Certs/Entry'
+
generated_sources += custom_target(
'xyz/openbmc_project/Certs/Entry__cpp'.underscorify(),
- input: [ '../../../../../yaml/xyz/openbmc_project/Certs/Entry.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../yaml/xyz/openbmc_project/Certs/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,5 +22,14 @@
'--directory', meson.current_source_dir() / '../../../../../yaml',
'xyz/openbmc_project/Certs/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,
)
diff --git a/gen/xyz/openbmc_project/Certs/Install/meson.build b/gen/xyz/openbmc_project/Certs/Install/meson.build
index fc02883..41d464d 100644
--- a/gen/xyz/openbmc_project/Certs/Install/meson.build
+++ b/gen/xyz/openbmc_project/Certs/Install/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Certs/Install'
+
generated_sources += custom_target(
'xyz/openbmc_project/Certs/Install__cpp'.underscorify(),
- input: [ '../../../../../yaml/xyz/openbmc_project/Certs/Install.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../yaml/xyz/openbmc_project/Certs/Install.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/Certs/Install',
],
+ 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/Certs/InstallAll/meson.build b/gen/xyz/openbmc_project/Certs/InstallAll/meson.build
index de7de71..cc6fd74 100644
--- a/gen/xyz/openbmc_project/Certs/InstallAll/meson.build
+++ b/gen/xyz/openbmc_project/Certs/InstallAll/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Certs/InstallAll'
+
generated_sources += custom_target(
'xyz/openbmc_project/Certs/InstallAll__cpp'.underscorify(),
- input: [ '../../../../../yaml/xyz/openbmc_project/Certs/InstallAll.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../yaml/xyz/openbmc_project/Certs/InstallAll.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/Certs/InstallAll',
],
+ 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/Certs/Replace/meson.build b/gen/xyz/openbmc_project/Certs/Replace/meson.build
index 74d4290..5e5c427 100644
--- a/gen/xyz/openbmc_project/Certs/Replace/meson.build
+++ b/gen/xyz/openbmc_project/Certs/Replace/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Certs/Replace'
+
generated_sources += custom_target(
'xyz/openbmc_project/Certs/Replace__cpp'.underscorify(),
- input: [ '../../../../../yaml/xyz/openbmc_project/Certs/Replace.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../yaml/xyz/openbmc_project/Certs/Replace.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/Certs/Replace',
],
+ 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/Certs/ReplaceAll/meson.build b/gen/xyz/openbmc_project/Certs/ReplaceAll/meson.build
index f50f5f9..53726a8 100644
--- a/gen/xyz/openbmc_project/Certs/ReplaceAll/meson.build
+++ b/gen/xyz/openbmc_project/Certs/ReplaceAll/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Certs/ReplaceAll'
+
generated_sources += custom_target(
'xyz/openbmc_project/Certs/ReplaceAll__cpp'.underscorify(),
- input: [ '../../../../../yaml/xyz/openbmc_project/Certs/ReplaceAll.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../yaml/xyz/openbmc_project/Certs/ReplaceAll.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/Certs/ReplaceAll',
],
+ 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/Certs/meson.build b/gen/xyz/openbmc_project/Certs/meson.build
index f6210aa..f877d06 100644
--- a/gen/xyz/openbmc_project/Certs/meson.build
+++ b/gen/xyz/openbmc_project/Certs/meson.build
@@ -1,8 +1,24 @@
# Generated file; do not modify.
+subdir('Authority')
+subdir('CSR')
+subdir('Certificate')
+subdir('Entry')
+subdir('Install')
+subdir('InstallAll')
+subdir('Replace')
+subdir('ReplaceAll')
+
+sdbusplus_current_path = 'xyz/openbmc_project/Certs'
+
generated_sources += custom_target(
'xyz/openbmc_project/Certs__cpp'.underscorify(),
- input: [ '../../../../yaml/xyz/openbmc_project/Certs.errors.yaml', ],
- output: [ 'error.cpp', 'error.hpp', ],
+ input: [
+ '../../../../yaml/xyz/openbmc_project/Certs.errors.yaml',
+ ],
+ output: [
+ 'error.cpp',
+ 'error.hpp',
+ ],
depend_files: sdbusplusplus_depfiles,
command: [
sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,10 +27,15 @@
'--directory', meson.current_source_dir() / '../../../../yaml',
'xyz/openbmc_project/Certs',
],
+ install: should_generate_cpp,
+ install_dir: [
+ false,
+ get_option('includedir') / sdbusplus_current_path,
+ ],
+ build_by_default: should_generate_cpp,
)
-subdir('Authority')
-generated_others += custom_target(
+generated_markdown += custom_target(
'xyz/openbmc_project/Certs/Authority__markdown'.underscorify(),
input: [ '../../../../yaml/xyz/openbmc_project/Certs/Authority.interface.yaml', ],
output: [ 'Authority.md' ],
@@ -26,10 +47,12 @@
'--directory', meson.current_source_dir() / '../../../../yaml',
'xyz/openbmc_project/Certs/Authority',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)
-subdir('CSR')
-generated_others += custom_target(
+generated_markdown += custom_target(
'xyz/openbmc_project/Certs/CSR__markdown'.underscorify(),
input: [ '../../../../yaml/xyz/openbmc_project/Certs/CSR.interface.yaml', ],
output: [ 'CSR.md' ],
@@ -41,10 +64,12 @@
'--directory', meson.current_source_dir() / '../../../../yaml',
'xyz/openbmc_project/Certs/CSR',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)
-subdir('Certificate')
-generated_others += custom_target(
+generated_markdown += custom_target(
'xyz/openbmc_project/Certs/Certificate__markdown'.underscorify(),
input: [ '../../../../yaml/xyz/openbmc_project/Certs/Certificate.interface.yaml', ],
output: [ 'Certificate.md' ],
@@ -56,10 +81,12 @@
'--directory', meson.current_source_dir() / '../../../../yaml',
'xyz/openbmc_project/Certs/Certificate',
],
+ 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/Certs/Entry__markdown'.underscorify(),
input: [ '../../../../yaml/xyz/openbmc_project/Certs/Entry.interface.yaml', ],
output: [ 'Entry.md' ],
@@ -71,10 +98,12 @@
'--directory', meson.current_source_dir() / '../../../../yaml',
'xyz/openbmc_project/Certs/Entry',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)
-subdir('Install')
-generated_others += custom_target(
+generated_markdown += custom_target(
'xyz/openbmc_project/Certs/Install__markdown'.underscorify(),
input: [ '../../../../yaml/xyz/openbmc_project/Certs/Install.interface.yaml', ],
output: [ 'Install.md' ],
@@ -86,10 +115,12 @@
'--directory', meson.current_source_dir() / '../../../../yaml',
'xyz/openbmc_project/Certs/Install',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)
-subdir('InstallAll')
-generated_others += custom_target(
+generated_markdown += custom_target(
'xyz/openbmc_project/Certs/InstallAll__markdown'.underscorify(),
input: [ '../../../../yaml/xyz/openbmc_project/Certs/InstallAll.interface.yaml', ],
output: [ 'InstallAll.md' ],
@@ -101,10 +132,12 @@
'--directory', meson.current_source_dir() / '../../../../yaml',
'xyz/openbmc_project/Certs/InstallAll',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)
-subdir('Replace')
-generated_others += custom_target(
+generated_markdown += custom_target(
'xyz/openbmc_project/Certs/Replace__markdown'.underscorify(),
input: [ '../../../../yaml/xyz/openbmc_project/Certs/Replace.interface.yaml', ],
output: [ 'Replace.md' ],
@@ -116,10 +149,12 @@
'--directory', meson.current_source_dir() / '../../../../yaml',
'xyz/openbmc_project/Certs/Replace',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)
-subdir('ReplaceAll')
-generated_others += custom_target(
+generated_markdown += custom_target(
'xyz/openbmc_project/Certs/ReplaceAll__markdown'.underscorify(),
input: [ '../../../../yaml/xyz/openbmc_project/Certs/ReplaceAll.interface.yaml', ],
output: [ 'ReplaceAll.md' ],
@@ -131,5 +166,8 @@
'--directory', meson.current_source_dir() / '../../../../yaml',
'xyz/openbmc_project/Certs/ReplaceAll',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)