meson: reformat with meson formatter
Apply the `meson format` results.
Change-Id: I874e2c57075988db53dad8e365c0bf1ac204f81b
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/dist/meson.build b/dist/meson.build
index 67be46a..b10af77 100644
--- a/dist/meson.build
+++ b/dist/meson.build
@@ -1,9 +1,12 @@
systemd_system_unit_dir = dependency('systemd').get_variable(
- 'systemdsystemunitdir')
+ 'systemdsystemunitdir',
+)
install_data(
- ['xyz.openbmc_project.Logging.service',
- 'xyz.openbmc_project.Syslog.Config.service'],
+ [
+ 'xyz.openbmc_project.Logging.service',
+ 'xyz.openbmc_project.Syslog.Config.service',
+ ],
install_dir: systemd_system_unit_dir,
)
@@ -15,7 +18,9 @@
dbus_system_bus_services_dir = dependency('dbus-1').get_variable(
'system_bus_services_dir',
- pkgconfig_define: ['prefix', get_option('prefix')])
+ pkgconfig_define: ['prefix', get_option('prefix')],
+)
install_data(
'dbus/xyz.openbmc_project.Logging.service',
- install_dir: dbus_system_bus_services_dir)
+ install_dir: dbus_system_bus_services_dir,
+)
diff --git a/extensions/openpower-pels/meson.build b/extensions/openpower-pels/meson.build
index f075004..addfbb8 100644
--- a/extensions/openpower-pels/meson.build
+++ b/extensions/openpower-pels/meson.build
@@ -1,7 +1,4 @@
-libpldm_dep = dependency(
- 'libpldm',
- default_options: ['oem-ibm=enabled'],
-)
+libpldm_dep = dependency('libpldm', default_options: ['oem-ibm=enabled'])
python_inst = import('python').find_installation('python3')
python_ver = python_inst.language_version()
@@ -26,15 +23,14 @@
cpp.find_library('phal'),
cpp.find_library('libguard'),
]
- extra_args += [
- '-DPEL_ENABLE_PHAL',
- ]
- log_manager_ext_args += [
- '-DPEL_ENABLE_PHAL',
- ]
+ extra_args += ['-DPEL_ENABLE_PHAL']
+ log_manager_ext_args += ['-DPEL_ENABLE_PHAL']
endif
libpel_sources = files(
+ extra_sources,
+ '../../paths.cpp',
+ '../../util.cpp',
'ascii_string.cpp',
'bcd_time.cpp',
'callout.cpp',
@@ -59,11 +55,8 @@
'section_factory.cpp',
'service_indicators.cpp',
'severity.cpp',
- 'user_header.cpp',
'temporary_file.cpp',
- '../../paths.cpp',
- '../../util.cpp',
- extra_sources,
+ 'user_header.cpp',
)
libpel_deps = [
@@ -80,12 +73,10 @@
libpel_lib = static_library(
'pel',
libpel_sources,
- 'pel_paths.cpp', # paths is separate because it is overridden during test.
+ 'pel_paths.cpp', # paths is separate because it is overridden during test.
include_directories: include_directories('../..', '../../gen'),
cpp_args: extra_args,
- dependencies: [
- libpel_deps,
- ]
+ dependencies: [libpel_deps],
)
libpel_dep = declare_dependency(
@@ -98,14 +89,10 @@
sdeventplus_dep,
pdi_dep,
phosphor_logging_dep,
- ]
+ ],
)
-log_manager_ext_deps += [
- libpel_dep,
- libpldm_dep,
- nlohmann_json_dep,
-]
+log_manager_ext_deps += [libpel_dep, libpldm_dep, nlohmann_json_dep]
log_manager_ext_sources += files(
'entry_points.cpp',
@@ -133,22 +120,15 @@
'user_data_json.cpp',
)
-peltool_deps = [
- CLI11_dep,
- conf_h_dep,
- python_dep,
-]
+peltool_deps = [CLI11_dep, conf_h_dep, python_dep]
executable(
'peltool',
'tools/peltool.cpp',
peltool_sources,
- cpp_args: [ '-DPELTOOL' ],
- link_args: [ '-lpython' + python_ver ],
+ cpp_args: ['-DPELTOOL'],
+ link_args: ['-lpython' + python_ver],
include_directories: include_directories('../..'),
- dependencies: [
- peltool_deps,
- libpel_dep,
- ],
+ dependencies: [peltool_deps, libpel_dep],
install: true,
)
diff --git a/lib/include/phosphor-logging/meson.build b/lib/include/phosphor-logging/meson.build
index f129afe..af25aae 100644
--- a/lib/include/phosphor-logging/meson.build
+++ b/lib/include/phosphor-logging/meson.build
@@ -3,12 +3,18 @@
input: [elog_gen, template_elog_gen],
output: 'elog-errors.hpp',
command: [
- python_prog, '@INPUT0@',
- '-t', '',
- '-m', '@INPUT1@',
- '-y', yamldir,
- '-u', tool_dir + '/',
- '-o', '@OUTPUT0@',
+ python_prog,
+ '@INPUT0@',
+ '-t',
+ '',
+ '-m',
+ '@INPUT1@',
+ '-y',
+ yamldir,
+ '-u',
+ tool_dir + '/',
+ '-o',
+ '@OUTPUT0@',
],
install: true,
install_dir: get_option('includedir') / 'phosphor-logging',
@@ -33,7 +39,4 @@
subdir: 'phosphor-logging/lg2',
)
-install_headers(
- 'test/sdjournal_mock.hpp',
- subdir: 'phosphor-logging/test',
-)
+install_headers('test/sdjournal_mock.hpp', subdir: 'phosphor-logging/test')
diff --git a/lib/meson.build b/lib/meson.build
index 3c7e3fc..8446767 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -6,12 +6,7 @@
threads_dep = dependency('threads')
-phosphor_logging_deps = [
- libsystemd_dep,
- pdi_dep,
- sdbusplus_dep,
- threads_dep
-]
+phosphor_logging_deps = [libsystemd_dep, pdi_dep, sdbusplus_dep, threads_dep]
phosphor_logging_lib = library(
'phosphor_logging',
@@ -22,10 +17,7 @@
phosphor_logging_gen,
implicit_include_directories: false,
include_directories: phosphor_logging_includes,
- dependencies: [
- phosphor_logging_deps,
- conf_h_dep,
- ],
+ dependencies: [phosphor_logging_deps, conf_h_dep],
version: meson.project_version(),
install: true,
)
diff --git a/meson.build b/meson.build
index e35fb69..daaf83b 100644
--- a/meson.build
+++ b/meson.build
@@ -1,12 +1,14 @@
-project('phosphor-logging', 'cpp',
+project(
+ 'phosphor-logging',
+ 'cpp',
meson_version: '>=1.1.1',
default_options: [
- 'buildtype=debugoptimized',
- 'cpp_std=c++23',
- 'warning_level=3',
- 'werror=true',
- 'libonly=' + (meson.is_subproject() ? 'true' : 'false'),
- 'tests=' + (meson.is_subproject() ? 'disabled' : 'auto'),
+ 'buildtype=debugoptimized',
+ 'cpp_std=c++23',
+ 'warning_level=3',
+ 'werror=true',
+ 'libonly=' + (meson.is_subproject() ? 'true' : 'false'),
+ 'tests=' + (meson.is_subproject() ? 'disabled' : 'auto'),
],
version: '1.0.0',
)
@@ -20,7 +22,9 @@
sdbuspp_gen_meson_prog = find_program('sdbus++-gen-meson', native: true)
sdbusplusplus_depfiles = files()
if sdbusplus_dep.type_name() == 'internal'
- sdbusplusplus_depfiles = subproject('sdbusplus').get_variable('sdbusplusplus_depfiles')
+ sdbusplusplus_depfiles = subproject('sdbusplus').get_variable(
+ 'sdbusplusplus_depfiles',
+ )
endif
pdi_dep = dependency('phosphor-dbus-interfaces')
@@ -37,7 +41,7 @@
subdir('lib')
if get_option('libonly')
- subdir_done()
+ subdir_done()
endif
sdeventplus_dep = dependency('sdeventplus')
@@ -48,14 +52,18 @@
'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
@@ -73,49 +81,64 @@
should_generate_cpp = true
should_generate_markdown = false
should_generate_registry = false
-yaml_selected_subdirs = [ 'xyz' ]
+yaml_selected_subdirs = ['xyz']
subdir('gen')
# Generate callouts-gen.hpp.
-callouts_gen = custom_target('callouts-gen.hpp'.underscorify(),
+callouts_gen = custom_target(
+ 'callouts-gen.hpp'.underscorify(),
input: [
'callouts/callouts.py',
'callouts/callouts-gen.mako.hpp',
get_option('callout_yaml'),
],
output: 'callouts-gen.hpp',
- command: [ python_prog, '@INPUT0@', '-i', '@INPUT2@', '-o', '@OUTPUT0@' ],
+ command: [python_prog, '@INPUT0@', '-i', '@INPUT2@', '-o', '@OUTPUT0@'],
)
# Generate elog-lookup.cpp
-elog_lookup_gen = custom_target('elog-lookup.cpp'.underscorify(),
+elog_lookup_gen = custom_target(
+ 'elog-lookup.cpp'.underscorify(),
input: files(
'tools/elog-gen.py',
'tools/phosphor-logging/templates/elog-lookup-template.mako.cpp',
),
output: 'elog-lookup.cpp',
command: [
- python_prog, '@INPUT0@',
- '-t', '',
- '-m', '@INPUT1@',
- '-y', yamldir,
- '-u', meson.current_source_dir() / 'tools/',
- '-o', '@OUTPUT0@',
+ python_prog,
+ '@INPUT0@',
+ '-t',
+ '',
+ '-m',
+ '@INPUT1@',
+ '-y',
+ yamldir,
+ '-u',
+ meson.current_source_dir() / 'tools/',
+ '-o',
+ '@OUTPUT0@',
],
)
# Generate elog-process-metadata.cpp
-elog_process_gen = custom_target('elog-process-metadata.cpp'.underscorify(),
+elog_process_gen = custom_target(
+ 'elog-process-metadata.cpp'.underscorify(),
input: files(
'tools/elog-gen.py',
'tools/phosphor-logging/templates/elog-process-metadata.mako.cpp',
),
output: 'elog-process-metadata.cpp',
command: [
- python_prog, '@INPUT0@',
- '-t', '',
- '-m', '@INPUT1@',
- '-y', yamldir,
- '-u', meson.current_source_dir() / 'tools/',
- '-o', '@OUTPUT0@',
+ python_prog,
+ '@INPUT0@',
+ '-t',
+ '',
+ '-m',
+ '@INPUT1@',
+ '-y',
+ yamldir,
+ '-u',
+ meson.current_source_dir() / 'tools/',
+ '-o',
+ '@OUTPUT0@',
],
)
@@ -140,7 +163,7 @@
'log_manager.cpp',
'paths.cpp',
'util.cpp',
- )
+ ),
]
log_manager_deps = [
cereal_dep,
@@ -150,20 +173,19 @@
sdbusplus_dep,
sdeventplus_dep,
]
-executable('phosphor-log-manager',
+executable(
+ 'phosphor-log-manager',
log_manager_sources,
log_manager_ext_sources,
'log_manager_main.cpp',
include_directories: include_directories('gen'),
cpp_args: log_manager_ext_args,
- dependencies: [
- log_manager_deps,
- log_manager_ext_deps,
- ],
+ dependencies: [log_manager_deps, log_manager_ext_deps],
install: true,
)
-executable('log-create',
+executable(
+ 'log-create',
'log_create_main.cpp',
dependencies: [
CLI11_dep,
@@ -176,16 +198,14 @@
)
# Generate test executables which run in obmc env (qemu, real hardware).
-executable('logging-test',
+executable(
+ 'logging-test',
'logging_test.cpp',
- dependencies: [
- pdi_dep,
- phosphor_logging_dep,
- sdbusplus_dep,
- ],
+ dependencies: [pdi_dep, phosphor_logging_dep, sdbusplus_dep],
install: true,
)
-executable('callout-test',
+executable(
+ 'callout-test',
'callouts/callout_test.cpp',
dependencies: [
conf_h_dep,
diff --git a/meson.options b/meson.options
index 2bab22c..6f8bdb4 100644
--- a/meson.options
+++ b/meson.options
@@ -4,7 +4,7 @@
'openpower-pel-extension',
type: 'feature',
description: 'Create PELs',
- value: 'disabled'
+ value: 'disabled',
)
option('yamldir', type: 'string', description: 'Path to YAML')
@@ -46,5 +46,5 @@
'lg2_commit_strategy',
type: 'combo',
choices: ['dbus', 'journal', 'both'],
- value: 'both'
+ value: 'both',
)
diff --git a/phosphor-rsyslog-config/meson.build b/phosphor-rsyslog-config/meson.build
index 4d85b20..9e8b399 100644
--- a/phosphor-rsyslog-config/meson.build
+++ b/phosphor-rsyslog-config/meson.build
@@ -1,4 +1,5 @@
-executable('phosphor-rsyslog-conf',
+executable(
+ 'phosphor-rsyslog-conf',
'main.cpp',
'server-conf.cpp',
'../elog_meta.cpp',
diff --git a/test/meson.build b/test/meson.build
index e5ab932..e69baa9 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -8,15 +8,15 @@
dependency('threads'),
gtest_proj.dependency('gtest'),
gtest_proj.dependency('gtest_main'),
- ]
+ ],
)
gmock_dep = gtest_proj.dependency('gmock')
- else
+ else
assert(
not get_option('tests').enabled(),
- 'Googletest is required if tests are enabled'
+ 'Googletest is required if tests are enabled',
)
- endif
+ endif
endif
if get_option('openpower-pel-extension').allowed()
@@ -50,7 +50,7 @@
phosphor_logging_dep,
],
include_directories: include_directories('..', '../gen'),
- )
+ ),
)
endforeach
diff --git a/test/openpower-pels/meson.build b/test/openpower-pels/meson.build
index 14021a9..73c9a09 100644
--- a/test/openpower-pels/meson.build
+++ b/test/openpower-pels/meson.build
@@ -33,7 +33,7 @@
generated_sources,
log_manager_ext_sources,
],
- 'deps': [ cereal_dep ],
+ 'deps': [cereal_dep],
},
'pel_rules': {},
'pel': {},
@@ -42,9 +42,7 @@
'real_pel': {},
'registry': {},
'repository': {
- 'sources': [
- '../../extensions/openpower-pels/repository.cpp',
- ],
+ 'sources': ['../../extensions/openpower-pels/repository.cpp'],
},
'section_header': {},
'service_indicators': {},
@@ -56,9 +54,7 @@
'user_data': {},
'user_header': {},
'temporary_file': {
- 'sources': [
- '../../extensions/openpower-pels/temporary_file.cpp',
- ],
+ 'sources': ['../../extensions/openpower-pels/temporary_file.cpp'],
},
}
@@ -71,15 +67,8 @@
libpel_sources,
peltool_sources,
'../common.cpp',
- include_directories: include_directories(
- '../../',
- '../../gen',
- ),
- dependencies: [
- libpel_deps,
- peltool_deps,
- gtest_dep,
- ],
+ include_directories: include_directories('../../', '../../gen'),
+ dependencies: [libpel_deps, peltool_deps, gtest_dep],
)
foreach t : openpower_pels.keys()
@@ -89,10 +78,8 @@
'test-openpower-pels-' + t.underscorify(),
t + '_test.cpp',
openpower_pels.get(t).get('sources', []),
- link_with: [
- openpower_test_lib,
- ],
- link_args: [ '-lpython' + python_ver ],
+ link_with: [openpower_test_lib],
+ link_args: ['-lpython' + python_ver],
dependencies: [
gtest_dep,
gmock_dep,
@@ -101,10 +88,7 @@
peltool_deps,
openpower_pels.get(t).get('deps', []),
],
- include_directories: include_directories(
- '../../',
- '../../gen',
- ),
- )
+ include_directories: include_directories('../../', '../../gen'),
+ ),
)
endforeach