meson: reformat with meson formatter
Apply the `meson format` results.
Change-Id: I7f6c667bb874e13d9ef86f901238e00fa56e7ced
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meson.build b/meson.build
index 9c8b0d5..9512eda 100644
--- a/meson.build
+++ b/meson.build
@@ -1,19 +1,23 @@
project(
- 'phosphor-dbus-monitor', 'cpp',
- version : '1.0.0',
+ 'phosphor-dbus-monitor',
+ 'cpp',
+ version: '1.0.0',
meson_version: '>=1.1.1',
default_options: [
'warning_level=3',
'werror=true',
'cpp_std=c++23',
'buildtype=debugoptimized',
- ]
+ ],
)
conf_data = configuration_data()
conf_data.set_quoted('OBJ_EVENT', '/xyz/openbmc_project/events')
conf_data.set_quoted('BUSNAME_EVENT', 'xyz.openbmc_project.Events')
-conf_data.set_quoted('EVENTS_PERSIST_PATH', '/var/lib/phosphor-dbus-monitor/events')
+conf_data.set_quoted(
+ 'EVENTS_PERSIST_PATH',
+ '/var/lib/phosphor-dbus-monitor/events',
+)
conf_data.set('CLASS_VERSION', 1)
conf_data.set('MAX_EVENTS', 20)
@@ -25,19 +29,23 @@
'cereal/cereal.hpp',
'cereal::specialize',
dependencies: cereal_dep,
- required: false)
+ required: false,
+)
if not has_cereal
cereal_opts = import('cmake').subproject_options()
- cereal_opts.add_cmake_defines({'BUILD_TESTS': 'OFF', 'SKIP_PERFORMANCE_COMPARISON': 'ON'})
+ cereal_opts.add_cmake_defines(
+ {'BUILD_TESTS': 'OFF', 'SKIP_PERFORMANCE_COMPARISON': 'ON'},
+ )
cereal_proj = import('cmake').subproject(
'cereal',
options: cereal_opts,
- required: false)
+ required: false,
+ )
assert(cereal_proj.found(), 'cereal is required')
cereal_dep = cereal_proj.dependency('cereal')
endif
-sdbusplus_dep = dependency('sdbusplus', required : false)
+sdbusplus_dep = dependency('sdbusplus', required: false)
sdeventplus_dep = dependency('sdeventplus')
phosphor_dbus_interfaces_dep = dependency('phosphor-dbus-interfaces')
phosphor_logging_dep = dependency('phosphor-logging')
@@ -47,15 +55,15 @@
if not sdbusplus_dep.found()
sdbusplus_proj = subproject('sdbusplus')
sdbusplus_dep = sdbusplus_proj.get_variable('sdbusplus_dep')
- sdbusplus_python_env = {'PYTHONPATH': meson.current_source_dir() / 'subprojects' / 'sdbusplus' / 'tools'}
+ sdbusplus_python_env = {
+ 'PYTHONPATH': meson.current_source_dir() / 'subprojects' / 'sdbusplus' / 'tools',
+ }
endif
prog_python = find_program('python3', required: true)
realpath_prog = find_program('realpath')
-configure_file(output: 'config.h',
- configuration: conf_data
-)
+configure_file(output: 'config.h', configuration: conf_data)
subdir('src')
subdir('mslverify')
diff --git a/meson.options b/meson.options
index fce4972..be6be54 100644
--- a/meson.options
+++ b/meson.options
@@ -1,11 +1,8 @@
-option(
- 'tests', type : 'feature',
- value: 'enabled',
- description : 'Build tests'
-)
+option('tests', type: 'feature', value: 'enabled', description: 'Build tests')
option(
- 'YAML_PATH', type: 'string',
+ 'YAML_PATH',
+ type: 'string',
value: '',
- description: 'The path to the yaml config files.'
-)
\ No newline at end of file
+ description: 'The path to the yaml config files.',
+)
diff --git a/mslverify/meson.build b/mslverify/meson.build
index 9f7baca..1646858 100644
--- a/mslverify/meson.build
+++ b/mslverify/meson.build
@@ -1,6 +1,4 @@
-sources_mslverify = [
- 'verify.cpp',
-]
+sources_mslverify = ['verify.cpp']
deps_mslverify = [
sdbusplus_dep,
diff --git a/src/meson.build b/src/meson.build
index 52d4e78..c8df2e3 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -4,14 +4,14 @@
'templates/callbackgroup.mako.cpp',
'templates/conditional.mako.cpp',
'templates/count.mako.cpp',
- 'templates/median.mako.cpp',
- 'templates/generated.mako.hpp',
- 'templates/journal.mako.cpp',
'templates/elog.mako.cpp',
'templates/errors.mako.hpp',
+ 'templates/event.mako.cpp',
+ 'templates/generated.mako.hpp',
+ 'templates/journal.mako.cpp',
+ 'templates/median.mako.cpp',
'templates/method.mako.cpp',
'templates/resolve_errors.mako.cpp',
- 'templates/event.mako.cpp',
)
yamldir = get_option('YAML_PATH')
@@ -24,12 +24,17 @@
command: [
prog_python,
meson.project_source_root() + '/src/pdmgen.py',
- '-t', 'generated.mako.hpp',
- '-p', meson.project_source_root() + '/src/templates',
- '-d', yamldir,
- '-o', meson.current_build_dir() + '/generated.hpp',
- '-e', meson.current_build_dir() + '/errors.hpp',
- 'generate-cpp'
+ '-t',
+ 'generated.mako.hpp',
+ '-p',
+ meson.project_source_root() + '/src/templates',
+ '-d',
+ yamldir,
+ '-o',
+ meson.current_build_dir() + '/generated.hpp',
+ '-e',
+ meson.current_build_dir() + '/errors.hpp',
+ 'generate-cpp',
],
depend_files: templates_depends,
env: sdbusplus_python_env,
diff --git a/src/test/meson.build b/src/test/meson.build
index ba4ff6e..d1de34d 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -8,13 +8,13 @@
dependency('threads'),
gtest_proj.dependency('gtest'),
gtest_proj.dependency('gtest_main'),
- ]
+ ],
)
gmock_dep = gtest_proj.dependency('gmock')
else
assert(
not get_option('tests').enabled(),
- 'Googletest is required if tests are enabled'
+ 'Googletest is required if tests are enabled',
)
endif
endif
@@ -24,12 +24,17 @@
command: [
prog_python,
meson.project_source_root() + '/src/pdmgen.py',
- '-t', 'pathgentest.mako.hpp',
- '-p', meson.project_source_root() + '/src/test/templates',
- '-d', meson.project_source_root() + '/src/test/yaml/pathgentest',
- '-o', meson.current_build_dir() + '/pathgentest.hpp',
- '-e', meson.current_build_dir() + '/pathgentest-errors.hpp',
- 'generate-cpp'
+ '-t',
+ 'pathgentest.mako.hpp',
+ '-p',
+ meson.project_source_root() + '/src/test/templates',
+ '-d',
+ meson.project_source_root() + '/src/test/yaml/pathgentest',
+ '-o',
+ meson.current_build_dir() + '/pathgentest.hpp',
+ '-e',
+ meson.current_build_dir() + '/pathgentest-errors.hpp',
+ 'generate-cpp',
],
input: [
'templates/pathgentest.mako.hpp',
@@ -40,19 +45,18 @@
output: 'pathgentest.hpp',
)
-pathgentest_sources = [
- pathgentest_hpp,
- 'pathgentest.cpp',
-]
+pathgentest_sources = [pathgentest_hpp, 'pathgentest.cpp']
-test('pathgentest.cpp',
- executable(
- 'pathgentest',
- pathgentest_sources,
- build_by_default: false,
- include_directories: ['..'],
- dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep]
- ))
+test(
+ 'pathgentest.cpp',
+ executable(
+ 'pathgentest',
+ pathgentest_sources,
+ build_by_default: false,
+ include_directories: ['..'],
+ dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep],
+ ),
+)
propertygentest_hpp = custom_target(
@@ -60,12 +64,17 @@
command: [
prog_python,
meson.project_source_root() + '/src/pdmgen.py',
- '-t', 'propertygentest.mako.hpp',
- '-p', meson.project_source_root() + '/src/test/templates',
- '-d', meson.project_source_root() + '/src/test/yaml/propertygentest',
- '-o', meson.current_build_dir() + '/propertygentest.hpp',
- '-e', meson.current_build_dir() + '/propertygentest-errors.hpp',
- 'generate-cpp'
+ '-t',
+ 'propertygentest.mako.hpp',
+ '-p',
+ meson.project_source_root() + '/src/test/templates',
+ '-d',
+ meson.project_source_root() + '/src/test/yaml/propertygentest',
+ '-o',
+ meson.current_build_dir() + '/propertygentest.hpp',
+ '-e',
+ meson.current_build_dir() + '/propertygentest-errors.hpp',
+ 'generate-cpp',
],
input: [
'templates/propertygentest.mako.hpp',
@@ -76,19 +85,18 @@
output: 'propertygentest.hpp',
)
-propertygentest_sources = [
- propertygentest_hpp,
- 'propertygentest.cpp',
-]
+propertygentest_sources = [propertygentest_hpp, 'propertygentest.cpp']
-test('propertygentest.cpp',
- executable(
- 'propertygentest',
- propertygentest_sources,
- build_by_default: false,
- include_directories: ['..'],
- dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep]
- ))
+test(
+ 'propertygentest.cpp',
+ executable(
+ 'propertygentest',
+ propertygentest_sources,
+ build_by_default: false,
+ include_directories: ['..'],
+ dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep],
+ ),
+)
propertywatchgentest_hpp = custom_target(
@@ -96,12 +104,17 @@
command: [
prog_python,
meson.project_source_root() + '/src/pdmgen.py',
- '-t', 'propertywatchgentest.mako.hpp',
- '-p', meson.project_source_root() + '/src/test/templates',
- '-d', meson.project_source_root() + '/src/test/yaml/propertywatchgentest',
- '-o', meson.current_build_dir() + '/propertywatchgentest.hpp',
- '-e', meson.current_build_dir() + '/propertywatchgentest-errors.hpp',
- 'generate-cpp'
+ '-t',
+ 'propertywatchgentest.mako.hpp',
+ '-p',
+ meson.project_source_root() + '/src/test/templates',
+ '-d',
+ meson.project_source_root() + '/src/test/yaml/propertywatchgentest',
+ '-o',
+ meson.current_build_dir() + '/propertywatchgentest.hpp',
+ '-e',
+ meson.current_build_dir() + '/propertywatchgentest-errors.hpp',
+ 'generate-cpp',
],
input: [
'templates/propertywatchgentest.mako.hpp',
@@ -117,14 +130,16 @@
'propertywatchgentest.cpp',
]
-test('propertywatchgentest.cpp',
- executable(
- 'propertywatchgentest',
- propertywatchgentest_sources,
- build_by_default: false,
- include_directories: ['..'],
- dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep]
- ))
+test(
+ 'propertywatchgentest.cpp',
+ executable(
+ 'propertywatchgentest',
+ propertywatchgentest_sources,
+ build_by_default: false,
+ include_directories: ['..'],
+ dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep],
+ ),
+)
callbackgentest_hpp = custom_target(
@@ -132,12 +147,17 @@
command: [
prog_python,
meson.project_source_root() + '/src/pdmgen.py',
- '-t', 'callbackgentest.mako.hpp',
- '-p', meson.project_source_root() + '/src/test/templates',
- '-d', meson.project_source_root() + '/src/test/yaml/callbackgentest',
- '-o', meson.current_build_dir() + '/callbackgentest.hpp',
- '-e', meson.current_build_dir() + '/callbackgentest-errors.hpp',
- 'generate-cpp'
+ '-t',
+ 'callbackgentest.mako.hpp',
+ '-p',
+ meson.project_source_root() + '/src/test/templates',
+ '-d',
+ meson.project_source_root() + '/src/test/yaml/callbackgentest',
+ '-o',
+ meson.current_build_dir() + '/callbackgentest.hpp',
+ '-e',
+ meson.current_build_dir() + '/callbackgentest-errors.hpp',
+ 'generate-cpp',
],
input: [
'templates/callbackgentest.mako.hpp',
@@ -148,19 +168,18 @@
output: 'callbackgentest.hpp',
)
-callbackgentest_sources = [
- callbackgentest_hpp,
- 'callbackgentest.cpp',
-]
+callbackgentest_sources = [callbackgentest_hpp, 'callbackgentest.cpp']
-test('callbackgentest.cpp',
- executable(
- 'callbackgentest',
- callbackgentest_sources,
- build_by_default: false,
- include_directories: ['..'],
- dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep]
- ))
+test(
+ 'callbackgentest.cpp',
+ executable(
+ 'callbackgentest',
+ callbackgentest_sources,
+ build_by_default: false,
+ include_directories: ['..'],
+ dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep],
+ ),
+)
callbackgroupgentest_hpp = custom_target(
@@ -168,12 +187,17 @@
command: [
prog_python,
meson.project_source_root() + '/src/pdmgen.py',
- '-t', 'callbackgroupgentest.mako.hpp',
- '-p', meson.project_source_root() + '/src/test/templates',
- '-d', meson.project_source_root() + '/src/test/yaml/callbackgroupgentest',
- '-o', meson.current_build_dir() + '/callbackgroupgentest.hpp',
- '-e', meson.current_build_dir() + '/callbackgroupgentest-errors.hpp',
- 'generate-cpp'
+ '-t',
+ 'callbackgroupgentest.mako.hpp',
+ '-p',
+ meson.project_source_root() + '/src/test/templates',
+ '-d',
+ meson.project_source_root() + '/src/test/yaml/callbackgroupgentest',
+ '-o',
+ meson.current_build_dir() + '/callbackgroupgentest.hpp',
+ '-e',
+ meson.current_build_dir() + '/callbackgroupgentest-errors.hpp',
+ 'generate-cpp',
],
input: [
'templates/callbackgroupgentest.mako.hpp',
@@ -188,14 +212,16 @@
'callbackgroupgentest.cpp',
]
-test('callbackgroupgentest.cpp',
- executable(
- 'callbackgroupgentest',
- callbackgroupgentest_sources,
- build_by_default: false,
- include_directories: ['..'],
- dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep]
- ))
+test(
+ 'callbackgroupgentest.cpp',
+ executable(
+ 'callbackgroupgentest',
+ callbackgroupgentest_sources,
+ build_by_default: false,
+ include_directories: ['..'],
+ dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep],
+ ),
+)
conditiongentest_hpp = custom_target(
@@ -203,12 +229,17 @@
command: [
prog_python,
meson.project_source_root() + '/src/pdmgen.py',
- '-t', 'conditiongentest.mako.hpp',
- '-p', meson.project_source_root() + '/src/test/templates',
- '-d', meson.project_source_root() + '/src/test/yaml/conditiongentest',
- '-o', meson.current_build_dir() + '/conditiongentest.hpp',
- '-e', meson.current_build_dir() + '/conditiongentest-errors.hpp',
- 'generate-cpp'
+ '-t',
+ 'conditiongentest.mako.hpp',
+ '-p',
+ meson.project_source_root() + '/src/test/templates',
+ '-d',
+ meson.project_source_root() + '/src/test/yaml/conditiongentest',
+ '-o',
+ meson.current_build_dir() + '/conditiongentest.hpp',
+ '-e',
+ meson.current_build_dir() + '/conditiongentest-errors.hpp',
+ 'generate-cpp',
],
input: [
'templates/conditiongentest.mako.hpp',
@@ -218,19 +249,18 @@
output: 'conditiongentest.hpp',
)
-conditiongentest_sources = [
- conditiongentest_hpp,
- 'conditiongentest.cpp',
-]
+conditiongentest_sources = [conditiongentest_hpp, 'conditiongentest.cpp']
-test('conditiongentest.cpp',
- executable(
- 'conditiongentest',
- conditiongentest_sources,
- build_by_default: false,
- include_directories: ['..'],
- dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep]
- ))
+test(
+ 'conditiongentest.cpp',
+ executable(
+ 'conditiongentest',
+ conditiongentest_sources,
+ build_by_default: false,
+ include_directories: ['..'],
+ dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep],
+ ),
+)
callbacktest_sources = [
@@ -253,14 +283,16 @@
gmock_dep,
]
-test('callbacktest.cpp',
- executable(
- 'callbacktest',
- callbacktest_sources,
- build_by_default: false,
- include_directories: ['..', '../../'],
- dependencies: callbacktest_deps,
- ))
+test(
+ 'callbacktest.cpp',
+ executable(
+ 'callbacktest',
+ callbacktest_sources,
+ build_by_default: false,
+ include_directories: ['..', '../../'],
+ dependencies: callbacktest_deps,
+ ),
+)
interfaceaddtest_hpp = custom_target(
@@ -268,12 +300,17 @@
command: [
prog_python,
meson.project_source_root() + '/src/pdmgen.py',
- '-t', 'interfaceaddtest.mako.hpp',
- '-p', meson.project_source_root() + '/src/test/templates',
- '-d', meson.project_source_root() + '/src/test/yaml/interfaceaddtest',
- '-o', meson.current_build_dir() + '/interfaceaddtest.hpp',
- '-e', meson.current_build_dir() + '/interfaceaddtest-errors.hpp',
- 'generate-cpp'
+ '-t',
+ 'interfaceaddtest.mako.hpp',
+ '-p',
+ meson.project_source_root() + '/src/test/templates',
+ '-d',
+ meson.project_source_root() + '/src/test/yaml/interfaceaddtest',
+ '-o',
+ meson.current_build_dir() + '/interfaceaddtest.hpp',
+ '-e',
+ meson.current_build_dir() + '/interfaceaddtest-errors.hpp',
+ 'generate-cpp',
],
input: [
'templates/interfaceaddtest.mako.hpp',
@@ -283,16 +320,20 @@
output: 'interfaceaddtest.hpp',
)
-interfaceaddtest_sources = [
- interfaceaddtest_hpp,
- 'interfaceaddtest.cpp',
-]
+interfaceaddtest_sources = [interfaceaddtest_hpp, 'interfaceaddtest.cpp']
-test('interfaceaddtest.cpp',
- executable(
- 'interfaceaddtest',
- interfaceaddtest_sources,
- build_by_default: false,
- include_directories: ['..'],
- dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep, sdeventplus_dep]
- ))
+test(
+ 'interfaceaddtest.cpp',
+ executable(
+ 'interfaceaddtest',
+ interfaceaddtest_sources,
+ build_by_default: false,
+ include_directories: ['..'],
+ dependencies: [
+ gtest_dep,
+ gmock_dep,
+ phosphor_dbus_interfaces_dep,
+ sdeventplus_dep,
+ ],
+ ),
+)