commit 8bcadac750d90427bfc4b282be47114c3dc415b1
author William A. Kennington III <wak@google.com> Thu Jun 10 15:44:54 2021 -0700
committer William A. Kennington III <wak@google.com> Wed Jun 30 21:38:32 2021 +0000
tree f42d278e2897fa9ef9890def22bbb26eba261aa8
parent a1e4084ab5467d54a053cd9bfd140127f41facdf

build: Update generated sdbus++

The version was bumped recently and we want to use the latest versions.

Change-Id: Ie174703705b63ec780d3b6b7ed11fa03bb3c7545
Signed-off-by: William A. Kennington III <wak@google.com>

gen/meson.build

diff --git a/gen/meson.build b/gen/meson.build
index af850f2..56193c7 100644
--- a/gen/meson.build
+++ b/gen/meson.build
@@ -4,10 +4,10 @@
     '--version',
 ).stdout().strip().split('\n')[0]
 
-if sdbuspp_gen_meson_ver != 'sdbus++-gen-meson version 2'
+if sdbuspp_gen_meson_ver != 'sdbus++-gen-meson version 3'
     warning('Generated meson files from wrong version of sdbus++-gen-meson.')
     warning(
-        'Expected "sdbus++-gen-meson version 2", got:',
+        'Expected "sdbus++-gen-meson version 3", got:',
         sdbuspp_gen_meson_ver
     )
 endif

gen/xyz/openbmc_project/Logging/Internal/Manager/meson.build

diff --git a/gen/xyz/openbmc_project/Logging/Internal/Manager/meson.build b/gen/xyz/openbmc_project/Logging/Internal/Manager/meson.build
index 230448b..69bab31 100644
--- a/gen/xyz/openbmc_project/Logging/Internal/Manager/meson.build
+++ b/gen/xyz/openbmc_project/Logging/Internal/Manager/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Logging/Internal/Manager__cpp'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/Logging/Internal/Manager.interface.yaml',  ],
+    input: [ '../../../../../../xyz/openbmc_project/Logging/Internal/Manager.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../../..',
         'xyz/openbmc_project/Logging/Internal/Manager',
     ],
 )

gen/xyz/openbmc_project/Logging/Internal/meson.build

diff --git a/gen/xyz/openbmc_project/Logging/Internal/meson.build b/gen/xyz/openbmc_project/Logging/Internal/meson.build
index aaa5ce8..044d181 100644
--- a/gen/xyz/openbmc_project/Logging/Internal/meson.build
+++ b/gen/xyz/openbmc_project/Logging/Internal/meson.build
@@ -2,15 +2,14 @@
 subdir('Manager')
 generated_others += custom_target(
     'xyz/openbmc_project/Logging/Internal/Manager__markdown'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/Logging/Internal/Manager.interface.yaml',  ],
+    input: [ '../../../../../xyz/openbmc_project/Logging/Internal/Manager.interface.yaml',  ],
     output: [ 'Manager.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../..',
         'xyz/openbmc_project/Logging/Internal/Manager',
     ],
-    build_by_default: true,
 )