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/intel/Control/NMISource/meson.build b/gen/com/intel/Control/NMISource/meson.build
index 8c94ec7..e0d10eb 100644
--- a/gen/com/intel/Control/NMISource/meson.build
+++ b/gen/com/intel/Control/NMISource/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'com/intel/Control/NMISource'
+
generated_sources += custom_target(
'com/intel/Control/NMISource__cpp'.underscorify(),
- input: [ '../../../../../yaml/com/intel/Control/NMISource.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../yaml/com/intel/Control/NMISource.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/intel/Control/NMISource',
],
+ 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/intel/Control/OCOTShutdownPolicy/meson.build b/gen/com/intel/Control/OCOTShutdownPolicy/meson.build
index 5bcdaaf..80e5cb9 100644
--- a/gen/com/intel/Control/OCOTShutdownPolicy/meson.build
+++ b/gen/com/intel/Control/OCOTShutdownPolicy/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'com/intel/Control/OCOTShutdownPolicy'
+
generated_sources += custom_target(
'com/intel/Control/OCOTShutdownPolicy__cpp'.underscorify(),
- input: [ '../../../../../yaml/com/intel/Control/OCOTShutdownPolicy.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../yaml/com/intel/Control/OCOTShutdownPolicy.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/intel/Control/OCOTShutdownPolicy',
],
+ 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/intel/Control/meson.build b/gen/com/intel/Control/meson.build
index 2342e1e..b41480e 100644
--- a/gen/com/intel/Control/meson.build
+++ b/gen/com/intel/Control/meson.build
@@ -1,6 +1,10 @@
# Generated file; do not modify.
subdir('NMISource')
-generated_others += custom_target(
+subdir('OCOTShutdownPolicy')
+
+sdbusplus_current_path = 'com/intel/Control'
+
+generated_markdown += custom_target(
'com/intel/Control/NMISource__markdown'.underscorify(),
input: [ '../../../../yaml/com/intel/Control/NMISource.interface.yaml', ],
output: [ 'NMISource.md' ],
@@ -12,10 +16,12 @@
'--directory', meson.current_source_dir() / '../../../../yaml',
'com/intel/Control/NMISource',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)
-subdir('OCOTShutdownPolicy')
-generated_others += custom_target(
+generated_markdown += custom_target(
'com/intel/Control/OCOTShutdownPolicy__markdown'.underscorify(),
input: [ '../../../../yaml/com/intel/Control/OCOTShutdownPolicy.interface.yaml', ],
output: [ 'OCOTShutdownPolicy.md' ],
@@ -27,5 +33,8 @@
'--directory', meson.current_source_dir() / '../../../../yaml',
'com/intel/Control/OCOTShutdownPolicy',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)
diff --git a/gen/com/intel/Protocol/PECI/Raw/meson.build b/gen/com/intel/Protocol/PECI/Raw/meson.build
index f1fdf82..99f26c5 100644
--- a/gen/com/intel/Protocol/PECI/Raw/meson.build
+++ b/gen/com/intel/Protocol/PECI/Raw/meson.build
@@ -1,8 +1,19 @@
# Generated file; do not modify.
+
+sdbusplus_current_path = 'com/intel/Protocol/PECI/Raw'
+
generated_sources += custom_target(
'com/intel/Protocol/PECI/Raw__cpp'.underscorify(),
- input: [ '../../../../../../yaml/com/intel/Protocol/PECI/Raw.interface.yaml', ],
- output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp', ],
+ input: [
+ '../../../../../../yaml/com/intel/Protocol/PECI/Raw.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/intel/Protocol/PECI/Raw',
],
+ 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/intel/Protocol/PECI/meson.build b/gen/com/intel/Protocol/PECI/meson.build
index 1d1896a..535c3ab 100644
--- a/gen/com/intel/Protocol/PECI/meson.build
+++ b/gen/com/intel/Protocol/PECI/meson.build
@@ -1,6 +1,9 @@
# Generated file; do not modify.
subdir('Raw')
-generated_others += custom_target(
+
+sdbusplus_current_path = 'com/intel/Protocol/PECI'
+
+generated_markdown += custom_target(
'com/intel/Protocol/PECI/Raw__markdown'.underscorify(),
input: [ '../../../../../yaml/com/intel/Protocol/PECI/Raw.interface.yaml', ],
output: [ 'Raw.md' ],
@@ -12,5 +15,8 @@
'--directory', meson.current_source_dir() / '../../../../../yaml',
'com/intel/Protocol/PECI/Raw',
],
+ install: should_generate_markdown,
+ install_dir: [inst_markdown_dir / sdbusplus_current_path],
+ build_by_default: should_generate_markdown,
)