meson: reformat with meson formatter
Apply the `meson format` results.
Change-Id: Ife939931ed265bc3f7eceda84a0e3db3bd1012de
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meson.build b/meson.build
index 46f7e71..cb028b9 100644
--- a/meson.build
+++ b/meson.build
@@ -1,10 +1,12 @@
-project('obmc-console', 'c',
+project(
+ 'obmc-console',
+ 'c',
default_options: [
- 'buildtype=debugoptimized',
- 'warning_level=3',
- 'werror=true',
- 'c_std=gnu17',
- 'tests=' + (meson.is_subproject() ? 'false' : 'true'),
+ 'buildtype=debugoptimized',
+ 'warning_level=3',
+ 'werror=true',
+ 'c_std=gnu17',
+ 'tests=' + (meson.is_subproject() ? 'false' : 'true'),
],
version: '1.1.0',
meson_version: '>=1.1.0',
@@ -13,84 +15,89 @@
add_project_arguments('-D_GNU_SOURCE', language: 'c')
systemdsystemunitdir = dependency('systemd').get_variable('systemdsystemunitdir')
-install_data('conf/obmc-console@.service.in',
- 'conf/obmc-console@.socket.in',
- rename: [
- 'obmc-console@.service',
- 'obmc-console@.socket',
- ],
- install_dir: systemdsystemunitdir,
- )
+install_data(
+ 'conf/obmc-console@.service.in',
+ 'conf/obmc-console@.socket.in',
+ rename: ['obmc-console@.service', 'obmc-console@.socket'],
+ install_dir: systemdsystemunitdir,
+)
if get_option('ssh').allowed()
- install_data('conf/obmc-console-ssh@.service.in',
- rename: [
- 'obmc-console-ssh@.service'
- ],
- install_dir: systemdsystemunitdir,
- )
+ install_data(
+ 'conf/obmc-console-ssh@.service.in',
+ rename: ['obmc-console-ssh@.service'],
+ install_dir: systemdsystemunitdir,
+ )
endif
if get_option('concurrent-servers')
- install_data('conf/client.2200.conf.in',
- rename: [ 'client.2200.conf' ],
- install_dir: systemdsystemunitdir)
+ install_data(
+ 'conf/client.2200.conf.in',
+ rename: ['client.2200.conf'],
+ install_dir: systemdsystemunitdir,
+ )
else
- if get_option('ssh').allowed()
- install_data('conf/obmc-console-ssh.socket.in',
- rename: [ 'obmc-console-ssh.socket' ],
- install_dir: systemdsystemunitdir)
- install_data('conf/obmc-console-ssh@.service.d/use-socket.conf.in',
- rename: [ 'use-socket.conf' ],
- install_dir: systemdsystemunitdir / 'obmc-console-ssh@.service.d')
- endif
+ if get_option('ssh').allowed()
+ install_data(
+ 'conf/obmc-console-ssh.socket.in',
+ rename: ['obmc-console-ssh.socket'],
+ install_dir: systemdsystemunitdir,
+ )
+ install_data(
+ 'conf/obmc-console-ssh@.service.d/use-socket.conf.in',
+ rename: ['use-socket.conf'],
+ install_dir: systemdsystemunitdir / 'obmc-console-ssh@.service.d',
+ )
+ endif
endif
udev = dependency('udev', required: get_option('udev'))
if udev.found()
- install_data('conf/80-obmc-console-uart.rules.in',
- rename: [ '80-obmc-console-uart.rules' ],
- install_dir: udev.get_variable('udevdir') / 'rules.d')
+ install_data(
+ 'conf/80-obmc-console-uart.rules.in',
+ rename: ['80-obmc-console-uart.rules'],
+ install_dir: udev.get_variable('udevdir') / 'rules.d',
+ )
endif
iniparser_dep = dependency('iniparser')
-server = executable('obmc-console-server',
- 'config.c',
- 'console-dbus.c',
- 'console-server.c',
- 'console-socket.c',
- 'console-mux.c',
- 'log-handler.c',
- 'ringbuffer.c',
- 'socket-handler.c',
- 'tty-handler.c',
- 'util.c',
- c_args: [
- '-DLOCALSTATEDIR="@0@"'.format(get_option('localstatedir')),
- '-DSYSCONFDIR="@0@"'.format(get_option('sysconfdir'))
- ],
- dependencies: [
- dependency('libsystemd'),
- iniparser_dep,
- dependency('libgpiod'),
- meson.get_compiler('c').find_library('rt')
- ],
- install_dir: get_option('sbindir'),
- install: true)
+server = executable(
+ 'obmc-console-server',
+ 'config.c',
+ 'console-dbus.c',
+ 'console-server.c',
+ 'console-socket.c',
+ 'console-mux.c',
+ 'log-handler.c',
+ 'ringbuffer.c',
+ 'socket-handler.c',
+ 'tty-handler.c',
+ 'util.c',
+ c_args: [
+ '-DLOCALSTATEDIR="@0@"'.format(get_option('localstatedir')),
+ '-DSYSCONFDIR="@0@"'.format(get_option('sysconfdir')),
+ ],
+ dependencies: [
+ dependency('libsystemd'),
+ iniparser_dep,
+ dependency('libgpiod'),
+ meson.get_compiler('c').find_library('rt'),
+ ],
+ install_dir: get_option('sbindir'),
+ install: true,
+)
-client = executable('obmc-console-client',
- 'config.c',
- 'console-client.c',
- 'console-socket.c',
- 'util.c',
- c_args: [
- '-DSYSCONFDIR="@0@"'.format(get_option('sysconfdir'))
- ],
- dependencies: [
- iniparser_dep,
- ],
- install: true)
+client = executable(
+ 'obmc-console-client',
+ 'config.c',
+ 'console-client.c',
+ 'console-socket.c',
+ 'util.c',
+ c_args: ['-DSYSCONFDIR="@0@"'.format(get_option('sysconfdir'))],
+ dependencies: [iniparser_dep],
+ install: true,
+)
if get_option('tests')
- subdir('test')
+ subdir('test')
endif
diff --git a/meson.options b/meson.options
index d8837f2..3dcc6ee 100644
--- a/meson.options
+++ b/meson.options
@@ -1,4 +1,13 @@
option('udev', type: 'feature', description: 'Install console udev rules')
-option('concurrent-servers', type: 'boolean', value: false, description: 'Support multiple concurrent obmc-console instances')
-option('ssh', type: 'feature', description: 'Support obmc-console-ssh and obmc-console-ssh-socket')
+option(
+ 'concurrent-servers',
+ type: 'boolean',
+ value: false,
+ description: 'Support multiple concurrent obmc-console instances',
+)
+option(
+ 'ssh',
+ type: 'feature',
+ description: 'Support obmc-console-ssh and obmc-console-ssh-socket',
+)
option('tests', type: 'boolean', description: 'Enable the test suite')
diff --git a/subprojects/packagefiles/iniparser/meson.build b/subprojects/packagefiles/iniparser/meson.build
index 511a830..ea3993d 100644
--- a/subprojects/packagefiles/iniparser/meson.build
+++ b/subprojects/packagefiles/iniparser/meson.build
@@ -9,11 +9,15 @@
run_command('sh', '-c', 'mkdir -p iniparser-include/iniparser', check: true)
run_command('sh', '-c', 'cp -r src/* iniparser-include/iniparser/', check: true)
-iniparser = shared_library('iniparser',
- 'src/dictionary.c',
- 'src/iniparser.c',
- include_directories : inc,
- install : true)
+iniparser = shared_library(
+ 'iniparser',
+ 'src/dictionary.c',
+ 'src/iniparser.c',
+ include_directories: inc,
+ install: true,
+)
-iniparser_dep = declare_dependency(include_directories : inc,
- link_with : iniparser)
+iniparser_dep = declare_dependency(
+ include_directories: inc,
+ link_with: iniparser,
+)
diff --git a/test/meson.build b/test/meson.build
index 61411b8..3377bdb 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -1,68 +1,77 @@
tests = [
- 'test-ringbuffer-boundary-poll',
- 'test-ringbuffer-boundary-read',
- 'test-ringbuffer-contained-offset-read',
- 'test-ringbuffer-contained-read',
- 'test-ringbuffer-poll-force',
- 'test-ringbuffer-read-commit',
- 'test-ringbuffer-simple-poll',
+ 'test-ringbuffer-boundary-poll',
+ 'test-ringbuffer-boundary-read',
+ 'test-ringbuffer-contained-offset-read',
+ 'test-ringbuffer-contained-read',
+ 'test-ringbuffer-poll-force',
+ 'test-ringbuffer-read-commit',
+ 'test-ringbuffer-simple-poll',
]
foreach t : tests
- test(t, executable(t, f'@t@.c', c_args: [ '-DSYSCONFDIR=""' ],
- include_directories: '..'))
+ test(
+ t,
+ executable(
+ t,
+ f'@t@.c',
+ c_args: ['-DSYSCONFDIR=""'],
+ include_directories: '..',
+ ),
+ )
endforeach
tests_depend_iniparser = [
- 'test-client-escape',
- 'test-config-parse',
- 'test-config-parse-bytesize',
- 'test-config-resolve-console-id'
+ 'test-client-escape',
+ 'test-config-parse',
+ 'test-config-parse-bytesize',
+ 'test-config-resolve-console-id',
]
foreach ct : tests_depend_iniparser
- test(
- ct,
- executable(
- ct,
- f'@ct@.c',
- c_args: [ '-DSYSCONFDIR=""' ],
- dependencies: [ iniparser_dep ],
- include_directories: '..'
+ test(
+ ct,
+ executable(
+ ct,
+ f'@ct@.c',
+ c_args: ['-DSYSCONFDIR=""'],
+ dependencies: [iniparser_dep],
+ include_directories: '..',
+ ),
)
- )
endforeach
socat = find_program('socat', native: true)
server_tests = [
- 'test-console-logs-to-file',
- 'test-console-logs-to-file-no-sections',
- 'test-console-socket-read',
- 'test-console-socket-write',
- 'test-multiple-consoles',
+ 'test-console-logs-to-file',
+ 'test-console-logs-to-file-no-sections',
+ 'test-console-socket-read',
+ 'test-console-socket-write',
+ 'test-multiple-consoles',
]
foreach st : server_tests
- test(st,
- find_program(st),
- args: [ socat.full_path(), server.full_path() ],
- depends: [ server ],
- suite: 'itests'
- )
+ test(
+ st,
+ find_program(st),
+ args: [socat.full_path(), server.full_path()],
+ depends: [server],
+ suite: 'itests',
+ )
endforeach
client_tests = [
- 'test-console-client-can-read',
- 'test-console-client-can-write',
- 'test-console-client-no-args',
+ 'test-console-client-can-read',
+ 'test-console-client-can-write',
+ 'test-console-client-no-args',
]
foreach ct : client_tests
- test(ct,
- find_program(ct),
- args: [ socat.full_path(), server.full_path(), client.full_path() ],
- depends: [ server, client ],
- suite: 'itests'
- )
+ test(
+ ct,
+ find_program(ct),
+ args: [socat.full_path(), server.full_path(), client.full_path()],
+ depends: [server, client],
+ suite: 'itests',
+ )
endforeach