commit 7f154004885f4e98bd8d0aa6f66259c117b95a4c
author Patrick Williams <patrick@stwcx.xyz> Fri Jan 03 10:12:23 2025 -0500
committer Patrick Williams <patrick@stwcx.xyz> Fri Jan 10 19:57:38 2025 +0000
tree 56df10fead4fe8c7e0d7b75e80871d16d16d2759
parent e2e4dde12e2fa9c8856e291dd6c7405a8fa4164f

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

gen/xyz/openbmc_project/Smbios/MDR_V2/meson.build

diff --git a/gen/xyz/openbmc_project/Smbios/MDR_V2/meson.build b/gen/xyz/openbmc_project/Smbios/MDR_V2/meson.build
index 18351b4..534e71a 100644
--- a/gen/xyz/openbmc_project/Smbios/MDR_V2/meson.build
+++ b/gen/xyz/openbmc_project/Smbios/MDR_V2/meson.build
@@ -1,8 +1,22 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Smbios/MDR_V2'
+
 generated_sources += custom_target(
     'xyz/openbmc_project/Smbios/MDR_V2__cpp'.underscorify(),
-    input: [ '../../../../../yaml/xyz/openbmc_project/Smbios/MDR_V2.errors.yaml', '../../../../../yaml/xyz/openbmc_project/Smbios/MDR_V2.interface.yaml',  ],
-    output: [ 'error.cpp', 'error.hpp', 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../yaml/xyz/openbmc_project/Smbios/MDR_V2.errors.yaml',
+        '../../../../../yaml/xyz/openbmc_project/Smbios/MDR_V2.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/Smbios/MDR_V2',
     ],
+    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,
 )
 

gen/xyz/openbmc_project/Smbios/meson.build

diff --git a/gen/xyz/openbmc_project/Smbios/meson.build b/gen/xyz/openbmc_project/Smbios/meson.build
index 2dc0186..5f32c24 100644
--- a/gen/xyz/openbmc_project/Smbios/meson.build
+++ b/gen/xyz/openbmc_project/Smbios/meson.build
@@ -1,6 +1,9 @@
 # Generated file; do not modify.
 subdir('MDR_V2')
-generated_others += custom_target(
+
+sdbusplus_current_path = 'xyz/openbmc_project/Smbios'
+
+generated_markdown += custom_target(
     'xyz/openbmc_project/Smbios/MDR_V2__markdown'.underscorify(),
     input: [ '../../../../yaml/xyz/openbmc_project/Smbios/MDR_V2.errors.yaml', '../../../../yaml/xyz/openbmc_project/Smbios/MDR_V2.interface.yaml',  ],
     output: [ 'MDR_V2.md' ],
@@ -12,5 +15,8 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Smbios/MDR_V2',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )