meson: reformat with meson formatter
Apply the `meson format` results.
Change-Id: Ie637fb174ce7db0343b39dc8870cd9ffdad7bf3a
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meson.build b/meson.build
index b0ea068..1674456 100644
--- a/meson.build
+++ b/meson.build
@@ -1,11 +1,7 @@
project(
'witherspoon-pfault-analysis',
'cpp',
- default_options: [
- 'warning_level=3',
- 'werror=true',
- 'cpp_std=c++23'
- ],
+ default_options: ['warning_level=3', 'werror=true', 'cpp_std=c++23'],
license: 'Apache-2.0',
version: '1.0',
meson_version: '>=1.1.1',
@@ -24,11 +20,14 @@
conf = configuration_data()
conf.set_quoted(
- 'INPUT_HISTORY_BUSNAME_ROOT', get_option('input-history-busname-root'))
+ 'INPUT_HISTORY_BUSNAME_ROOT',
+ get_option('input-history-busname-root'),
+)
conf.set_quoted(
- 'INPUT_HISTORY_SENSOR_ROOT', get_option('input-history-sensor-root'))
-conf.set10(
- 'UCD90160_DEVICE_ACCESS', get_option('ucd90160-access'))
+ 'INPUT_HISTORY_SENSOR_ROOT',
+ get_option('input-history-sensor-root'),
+)
+conf.set10('UCD90160_DEVICE_ACCESS', get_option('ucd90160-access'))
configure_file(output: 'config.h', configuration: conf)
diff --git a/meson.options b/meson.options
index d8dcc95..0548261 100644
--- a/meson.options
+++ b/meson.options
@@ -1,21 +1,25 @@
option(
- 'input-history-busname-root', type: 'string',
+ 'input-history-busname-root',
+ type: 'string',
value: 'org.open_power.powersupply',
description: 'The D-Bus busname root for the PS input history.',
)
option(
- 'input-history-sensor-root', type: 'string',
+ 'input-history-sensor-root',
+ type: 'string',
value: '/org/open_power/sensors/aggregation/per_30s',
description: 'The D-Bus power sensors namespace root.',
)
+option('tests', type: 'feature', description: 'Build tests.')
option(
- 'tests', type: 'feature', description: 'Build tests.',
-)
-option(
- 'ucd90160-access', type: 'boolean', value: true,
+ 'ucd90160-access',
+ type: 'boolean',
+ value: true,
description: 'Enable UCD90160 hardware access.',
)
option(
- 'ucd90160-yaml', type: 'string', value: 'example/ucd90160.yaml',
+ 'ucd90160-yaml',
+ type: 'string',
+ value: 'example/ucd90160.yaml',
description: 'The sequencer definition file to use.',
)
diff --git a/org/open_power/Witherspoon/Fault/meson.build b/org/open_power/Witherspoon/Fault/meson.build
index 0669c2e..3ec58e6 100644
--- a/org/open_power/Witherspoon/Fault/meson.build
+++ b/org/open_power/Witherspoon/Fault/meson.build
@@ -3,7 +3,8 @@
capture: true,
command: [
sdbuspp,
- '-r', meson.source_root(),
+ '-r',
+ meson.source_root(),
'error',
'exception-header',
'org.open_power.Witherspoon.Fault',
@@ -19,7 +20,8 @@
capture: true,
command: [
sdbuspp,
- '-r', meson.source_root(),
+ '-r',
+ meson.source_root(),
'error',
'exception-cpp',
'org.open_power.Witherspoon.Fault',
diff --git a/power-sequencer/meson.build b/power-sequencer/meson.build
index a52fe02..c4a2745 100644
--- a/power-sequencer/meson.build
+++ b/power-sequencer/meson.build
@@ -1,13 +1,17 @@
ucd90160_defs_cpp = custom_target(
'ucd90160_defs.cpp',
command: [
- prog_python, '@INPUT0@',
- '-i', '@INPUT1@', '-o', meson.current_build_dir(),
+ prog_python,
+ '@INPUT0@',
+ '-i',
+ '@INPUT1@',
+ '-o',
+ meson.current_build_dir(),
],
input: [
'gen-ucd90160-defs.py',
get_option('ucd90160-yaml'),
- 'templates/ucd90160_defs.mako.cpp'
+ 'templates/ucd90160_defs.mako.cpp',
],
output: 'ucd90160_defs.cpp',
)
diff --git a/power-supply/meson.build b/power-supply/meson.build
index f58e02f..5cf23c8 100644
--- a/power-supply/meson.build
+++ b/power-supply/meson.build
@@ -5,16 +5,10 @@
'main.cpp',
'power_supply.cpp',
'record_manager.cpp',
- dependencies: [
- phosphor_dbus_interfaces,
- phosphor_logging,
- sdbusplus,
- ],
+ dependencies: [phosphor_dbus_interfaces, phosphor_logging, sdbusplus],
include_directories: '..',
install: true,
- link_with: [
- libpower,
- ]
+ link_with: [libpower],
)
record_manager = psu_monitor.extract_objects('record_manager.cpp')
diff --git a/power-supply/test/meson.build b/power-supply/test/meson.build
index 8006d63..caccb71 100644
--- a/power-supply/test/meson.build
+++ b/power-supply/test/meson.build
@@ -11,9 +11,7 @@
],
implicit_include_directories: false,
include_directories: '../..',
- link_with: [
- libpower,
- ],
+ link_with: [libpower],
objects: record_manager,
- )
+ ),
)
diff --git a/test/meson.build b/test/meson.build
index aaa21b4..d88587c 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -1,12 +1,10 @@
test(
'nvtest',
executable(
- 'nvtest', 'nvtest.cpp',
- dependencies: [
- gmock,
- gtest,
- ],
+ 'nvtest',
+ 'nvtest.cpp',
+ dependencies: [gmock, gtest],
implicit_include_directories: false,
include_directories: '..',
- )
+ ),
)