regenerate-meson: enable meson formatting
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Iaee0721778dfce7cfcbd90a8dea0eb0d5de774a0
diff --git a/gen/meson.build b/gen/meson.build
index ef27aee..f2ecd59 100644
--- a/gen/meson.build
+++ b/gen/meson.build
@@ -3,13 +3,15 @@
sdbuspp_gen_meson_prog,
'--version',
check: true,
-).stdout().strip().split('\n')[0]
+).stdout().strip().split(
+ '\n',
+)[0]
if sdbuspp_gen_meson_ver != 'sdbus++-gen-meson version 10'
warning('Generated meson files from wrong version of sdbus++-gen-meson.')
warning(
'Expected "sdbus++-gen-meson version 10", got:',
- sdbuspp_gen_meson_ver
+ sdbuspp_gen_meson_ver,
)
endif
diff --git a/gen/regenerate-meson b/gen/regenerate-meson
index a39ad64..f60d724 100755
--- a/gen/regenerate-meson
+++ b/gen/regenerate-meson
@@ -17,7 +17,11 @@
exit 1
fi
+echo "Generating meson files..."
$SDBUSPP_GEN_MESON \
--command meson \
--directory "$REPO_ROOT/yaml" \
--output "$REPO_ROOT/gen"
+
+echo "Formatting meson files..."
+find "$REPO_ROOT/gen" -name "meson.build" -exec meson format -i {} +
diff --git a/gen/xyz/openbmc_project/Logging/Internal/Manager/meson.build b/gen/xyz/openbmc_project/Logging/Internal/Manager/meson.build
index 6f5a0ee..34eca5b 100644
--- a/gen/xyz/openbmc_project/Logging/Internal/Manager/meson.build
+++ b/gen/xyz/openbmc_project/Logging/Internal/Manager/meson.build
@@ -16,10 +16,15 @@
],
depend_files: sdbusplusplus_depfiles,
command: [
- sdbuspp_gen_meson_prog, '--command', 'cpp',
- '--output', meson.current_build_dir(),
- '--tool', sdbusplusplus_prog,
- '--directory', meson.current_source_dir() / '../../../../../../yaml',
+ sdbuspp_gen_meson_prog,
+ '--command',
+ 'cpp',
+ '--output',
+ meson.current_build_dir(),
+ '--tool',
+ sdbusplusplus_prog,
+ '--directory',
+ meson.current_source_dir() / '../../../../../../yaml',
'xyz/openbmc_project/Logging/Internal/Manager',
],
install: should_generate_cpp,
diff --git a/gen/xyz/openbmc_project/Logging/Internal/meson.build b/gen/xyz/openbmc_project/Logging/Internal/meson.build
index 99a090e..82234df 100644
--- a/gen/xyz/openbmc_project/Logging/Internal/meson.build
+++ b/gen/xyz/openbmc_project/Logging/Internal/meson.build
@@ -5,14 +5,21 @@
generated_markdown += custom_target(
'xyz/openbmc_project/Logging/Internal/Manager__markdown'.underscorify(),
- input: [ '../../../../../yaml/xyz/openbmc_project/Logging/Internal/Manager.interface.yaml', ],
- output: [ 'Manager.md' ],
+ input: [
+ '../../../../../yaml/xyz/openbmc_project/Logging/Internal/Manager.interface.yaml',
+ ],
+ output: ['Manager.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() / '../../../../../yaml',
+ sdbuspp_gen_meson_prog,
+ '--command',
+ 'markdown',
+ '--output',
+ meson.current_build_dir(),
+ '--tool',
+ sdbusplusplus_prog,
+ '--directory',
+ meson.current_source_dir() / '../../../../../yaml',
'xyz/openbmc_project/Logging/Internal/Manager',
],
install: should_generate_markdown,