commit 56eb17759ff3c1c57b561e8f2f1e64944df55b46
author William A. Kennington III <wak@google.com> Tue May 18 20:41:26 2021 -0700
committer William A. Kennington III <wak@google.com> Tue Jun 01 18:50:15 2021 -0700
tree 182781d6159c50eb7832a7050aea8a168c4b1df0
parent 2bba553d03bb32d6db9016910f5cf86a038b030c

sdbus++-gen-meson: Support non-source root yaml directories

Right now, this tool assumes that the input root directory is the source
root. Some of our packages have their yaml files in non-root directories
and we want to support them.

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

tools/sdbus++-gen-meson

diff --git a/tools/sdbus++-gen-meson b/tools/sdbus++-gen-meson
index 53a948d..cb48187 100755
--- a/tools/sdbus++-gen-meson
+++ b/tools/sdbus++-gen-meson
@@ -171,13 +171,15 @@
 ##
 ## $1 - The interface to generate a target for.
 function meson_cpp_target {
+    mesondir="$outputdir/$1"
+    yamldir="$(realpath --relative-to="$mesondir" "$rootdir")"
 
     # Determine the source and output files based on the YAMLs present.
     sources=""
     outputs=""
     for s in ${interfaces[$1]};
     do
-        sources="${sources}meson.project_source_root() / '$1.$s', "
+      sources="'$yamldir/$1.$s', "
 
         case "$s" in
             errors.yaml)
@@ -192,7 +194,7 @@
     done
 
     # Create the target to generate the 'outputs'.
-    cat >> "$outputdir/$1/meson.build" \
+    cat >> "$mesondir/meson.build" \
 <<EOF
 generated_sources += custom_target(
     '$1__cpp'.underscorify(),
@@ -202,7 +204,7 @@
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '$yamldir',
         '$1',
     ],
 )
@@ -213,16 +215,18 @@
 ## Generate the meson target for the markdown files from a YAML interface.
 ## $1 - The interface to generate a target for.
 function meson_md_target {
+    mesondir="$outputdir/$(dirname "$1")"
+    yamldir="$(realpath --relative-to="$mesondir" "$rootdir")"
 
     # Determine the source files based on the YAMLs present.
     sources=""
     for s in ${interfaces[$1]};
     do
-        sources="${sources}meson.project_source_root() / '$1.$s', "
+        sources="'$yamldir/$1.$s', "
     done
 
     # Create the target to generate the interface.md file.
-    cat >> "$outputdir/$(dirname "$1")/meson.build" \
+    cat >> "$mesondir/meson.build" \
 <<EOF
 generated_others += custom_target(
     '$1__markdown'.underscorify(),
@@ -232,7 +236,7 @@
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '$yamldir',
         '$1',
     ],
     build_by_default: true,