commit e2a58518499b01b931e29f12ed0bcfc586452f75
author Patrick Williams <patrick@stwcx.xyz> Tue Sep 13 11:26:57 2022 -0500
committer Patrick Williams <patrick@stwcx.xyz> Tue Sep 13 11:34:10 2022 -0500
tree 68ba3c7bfab85386fac7410241b4809779e8c2d0
parent ed7b633fe6844fe9320a49743da332368371604d

yaml: move to subdirectory

A pending sdbusplus change (I38b69bc67b6a3d80cda1b508a76e106a50d8ab93)
is going to require YAML to be in a specific subdirectory and not in
the root.  Move here in prep for that change.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I42cd6599f751b34284243080dd213be3254d147c

gen/meson.build

diff --git a/gen/meson.build b/gen/meson.build
index 56193c7..2756633 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 3'
+if sdbuspp_gen_meson_ver != 'sdbus++-gen-meson version 4'
     warning('Generated meson files from wrong version of sdbus++-gen-meson.')
     warning(
-        'Expected "sdbus++-gen-meson version 3", got:',
+        'Expected "sdbus++-gen-meson version 4", got:',
         sdbuspp_gen_meson_ver
     )
 endif

gen/org/open_power/OCC/Device/meson.build

diff --git a/gen/org/open_power/OCC/Device/meson.build b/gen/org/open_power/OCC/Device/meson.build
index 0f287ad..84af1ab 100644
--- a/gen/org/open_power/OCC/Device/meson.build
+++ b/gen/org/open_power/OCC/Device/meson.build
@@ -1,13 +1,14 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'org/open_power/OCC/Device__cpp'.underscorify(),
-    input: [ '../../../../../org/open_power/OCC/Device.errors.yaml',  ],
+    input: [ '../../../../../yaml/org/open_power/OCC/Device.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
+    depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'org/open_power/OCC/Device',
     ],
 )

gen/org/open_power/OCC/meson.build

diff --git a/gen/org/open_power/OCC/meson.build b/gen/org/open_power/OCC/meson.build
index 7433b15..c80db64 100644
--- a/gen/org/open_power/OCC/meson.build
+++ b/gen/org/open_power/OCC/meson.build
@@ -2,13 +2,14 @@
 subdir('Device')
 generated_others += custom_target(
     'org/open_power/OCC/Device__markdown'.underscorify(),
-    input: [ '../../../../org/open_power/OCC/Device.errors.yaml',  ],
+    input: [ '../../../../yaml/org/open_power/OCC/Device.errors.yaml',  ],
     output: [ 'Device.md' ],
+    depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'org/open_power/OCC/Device',
     ],
 )

gen/regenerate-meson

diff --git a/gen/regenerate-meson b/gen/regenerate-meson
index 56bc2c6..a39ad64 100755
--- a/gen/regenerate-meson
+++ b/gen/regenerate-meson
@@ -19,5 +19,5 @@
 
 $SDBUSPP_GEN_MESON \
     --command meson \
-    --directory "$REPO_ROOT" \
+    --directory "$REPO_ROOT/yaml" \
     --output "$REPO_ROOT/gen"