regenerate-meson: enable meson formatting
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I58730e17d8350470783c7fa45466ee9ac19b2c48
diff --git a/test/gen/meson.build b/test/gen/meson.build
index ef27aee..f2ecd59 100644
--- a/test/gen/meson.build
+++ b/test/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/test/gen/regenerate-meson b/test/gen/regenerate-meson
index 235d551..857729c 100755
--- a/test/gen/regenerate-meson
+++ b/test/gen/regenerate-meson
@@ -1,4 +1,5 @@
#!/bin/bash
cd "$(dirname "$0")" || exit
export PATH="${PWD}/../../tools:${PATH}"
-exec sdbus++-gen-meson --command meson --directory ../yaml --output .
+sdbus++-gen-meson --command meson --directory ../yaml --output .
+find . -name "meson.build" -exec meson format -i {} +
diff --git a/test/gen/server/Test/meson.build b/test/gen/server/Test/meson.build
index 53b0820..abeedbf 100644
--- a/test/gen/server/Test/meson.build
+++ b/test/gen/server/Test/meson.build
@@ -4,9 +4,7 @@
generated_sources += custom_target(
'server/Test__cpp'.underscorify(),
- input: [
- '../../../yaml/server/Test.interface.yaml',
- ],
+ input: ['../../../yaml/server/Test.interface.yaml'],
output: [
'common.hpp',
'server.hpp',
@@ -16,10 +14,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',
'server/Test',
],
install: should_generate_cpp,
diff --git a/test/gen/server/meson.build b/test/gen/server/meson.build
index 20a77bf..34c9b4b 100644
--- a/test/gen/server/meson.build
+++ b/test/gen/server/meson.build
@@ -5,14 +5,19 @@
generated_markdown += custom_target(
'server/Test__markdown'.underscorify(),
- input: [ '../../yaml/server/Test.interface.yaml', ],
- output: [ 'Test.md' ],
+ input: ['../../yaml/server/Test.interface.yaml'],
+ output: ['Test.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',
'server/Test',
],
install: should_generate_markdown,