build: Move yaml files into a subdirectory
This improves generation speed and ensures that the yamldir only
contains yaml files.
Change-Id: I6094f23dfc4af2bb43ca7fdba047014142e1991f
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/gen/regenerate-meson b/gen/regenerate-meson
index 5b4fc06..e2a02c4 100755
--- a/gen/regenerate-meson
+++ b/gen/regenerate-meson
@@ -1,4 +1,4 @@
#!/bin/bash
cd "$(dirname "$0")" || exit
export PATH="$PWD/../subprojects/sdbusplus/tools:$PATH"
-exec sdbus++-gen-meson --command meson --directory .. --output .
+exec sdbus++-gen-meson --command meson --directory ../yaml --output .
diff --git a/gen/xyz/openbmc_project/Network/IP/Create/meson.build b/gen/xyz/openbmc_project/Network/IP/Create/meson.build
index 2d0d1e7..16dc0a1 100644
--- a/gen/xyz/openbmc_project/Network/IP/Create/meson.build
+++ b/gen/xyz/openbmc_project/Network/IP/Create/meson.build
@@ -1,13 +1,13 @@
# Generated file; do not modify.
generated_sources += custom_target(
'xyz/openbmc_project/Network/IP/Create__cpp'.underscorify(),
- input: [ '../../../../../../xyz/openbmc_project/Network/IP/Create.interface.yaml', ],
+ input: [ '../../../../../../yaml/xyz/openbmc_project/Network/IP/Create.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.current_source_dir() / '../../../../../..',
+ '--directory', meson.current_source_dir() / '../../../../../../yaml',
'xyz/openbmc_project/Network/IP/Create',
],
)
diff --git a/gen/xyz/openbmc_project/Network/IP/meson.build b/gen/xyz/openbmc_project/Network/IP/meson.build
index 3953ad3..8f0184b 100644
--- a/gen/xyz/openbmc_project/Network/IP/meson.build
+++ b/gen/xyz/openbmc_project/Network/IP/meson.build
@@ -2,13 +2,13 @@
subdir('Create')
generated_others += custom_target(
'xyz/openbmc_project/Network/IP/Create__markdown'.underscorify(),
- input: [ '../../../../../xyz/openbmc_project/Network/IP/Create.interface.yaml', ],
+ input: [ '../../../../../yaml/xyz/openbmc_project/Network/IP/Create.interface.yaml', ],
output: [ 'Create.md' ],
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',
'xyz/openbmc_project/Network/IP/Create',
],
)
diff --git a/gen/xyz/openbmc_project/Network/Neighbor/CreateStatic/meson.build b/gen/xyz/openbmc_project/Network/Neighbor/CreateStatic/meson.build
index 5144d7b..7bc95ee 100644
--- a/gen/xyz/openbmc_project/Network/Neighbor/CreateStatic/meson.build
+++ b/gen/xyz/openbmc_project/Network/Neighbor/CreateStatic/meson.build
@@ -1,13 +1,13 @@
# Generated file; do not modify.
generated_sources += custom_target(
'xyz/openbmc_project/Network/Neighbor/CreateStatic__cpp'.underscorify(),
- input: [ '../../../../../../xyz/openbmc_project/Network/Neighbor/CreateStatic.interface.yaml', ],
+ input: [ '../../../../../../yaml/xyz/openbmc_project/Network/Neighbor/CreateStatic.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.current_source_dir() / '../../../../../..',
+ '--directory', meson.current_source_dir() / '../../../../../../yaml',
'xyz/openbmc_project/Network/Neighbor/CreateStatic',
],
)
diff --git a/gen/xyz/openbmc_project/Network/Neighbor/meson.build b/gen/xyz/openbmc_project/Network/Neighbor/meson.build
index ecd4f9c..4cc58c6 100644
--- a/gen/xyz/openbmc_project/Network/Neighbor/meson.build
+++ b/gen/xyz/openbmc_project/Network/Neighbor/meson.build
@@ -2,13 +2,13 @@
subdir('CreateStatic')
generated_others += custom_target(
'xyz/openbmc_project/Network/Neighbor/CreateStatic__markdown'.underscorify(),
- input: [ '../../../../../xyz/openbmc_project/Network/Neighbor/CreateStatic.interface.yaml', ],
+ input: [ '../../../../../yaml/xyz/openbmc_project/Network/Neighbor/CreateStatic.interface.yaml', ],
output: [ 'CreateStatic.md' ],
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',
'xyz/openbmc_project/Network/Neighbor/CreateStatic',
],
)
diff --git a/gen/xyz/openbmc_project/Network/VLAN/Create/meson.build b/gen/xyz/openbmc_project/Network/VLAN/Create/meson.build
index f062e44..2ba7646 100644
--- a/gen/xyz/openbmc_project/Network/VLAN/Create/meson.build
+++ b/gen/xyz/openbmc_project/Network/VLAN/Create/meson.build
@@ -1,13 +1,13 @@
# Generated file; do not modify.
generated_sources += custom_target(
'xyz/openbmc_project/Network/VLAN/Create__cpp'.underscorify(),
- input: [ '../../../../../../xyz/openbmc_project/Network/VLAN/Create.interface.yaml', ],
+ input: [ '../../../../../../yaml/xyz/openbmc_project/Network/VLAN/Create.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.current_source_dir() / '../../../../../..',
+ '--directory', meson.current_source_dir() / '../../../../../../yaml',
'xyz/openbmc_project/Network/VLAN/Create',
],
)
diff --git a/gen/xyz/openbmc_project/Network/VLAN/meson.build b/gen/xyz/openbmc_project/Network/VLAN/meson.build
index 8d26688..b17337d 100644
--- a/gen/xyz/openbmc_project/Network/VLAN/meson.build
+++ b/gen/xyz/openbmc_project/Network/VLAN/meson.build
@@ -2,13 +2,13 @@
subdir('Create')
generated_others += custom_target(
'xyz/openbmc_project/Network/VLAN/Create__markdown'.underscorify(),
- input: [ '../../../../../xyz/openbmc_project/Network/VLAN/Create.interface.yaml', ],
+ input: [ '../../../../../yaml/xyz/openbmc_project/Network/VLAN/Create.interface.yaml', ],
output: [ 'Create.md' ],
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',
'xyz/openbmc_project/Network/VLAN/Create',
],
)
diff --git a/xyz/openbmc_project/Network/IP/Create.interface.yaml b/yaml/xyz/openbmc_project/Network/IP/Create.interface.yaml
similarity index 100%
rename from xyz/openbmc_project/Network/IP/Create.interface.yaml
rename to yaml/xyz/openbmc_project/Network/IP/Create.interface.yaml
diff --git a/xyz/openbmc_project/Network/Neighbor/CreateStatic.interface.yaml b/yaml/xyz/openbmc_project/Network/Neighbor/CreateStatic.interface.yaml
similarity index 100%
rename from xyz/openbmc_project/Network/Neighbor/CreateStatic.interface.yaml
rename to yaml/xyz/openbmc_project/Network/Neighbor/CreateStatic.interface.yaml
diff --git a/xyz/openbmc_project/Network/VLAN/Create.interface.yaml b/yaml/xyz/openbmc_project/Network/VLAN/Create.interface.yaml
similarity index 100%
rename from xyz/openbmc_project/Network/VLAN/Create.interface.yaml
rename to yaml/xyz/openbmc_project/Network/VLAN/Create.interface.yaml