meson: reformat with meson formatter
Apply the `meson format` results.
Change-Id: Ic556a6e6065b9df4cf778ba91d7bf5619f2955ca
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meson.build b/meson.build
index ccd6bae..46df4fb 100644
--- a/meson.build
+++ b/meson.build
@@ -1,17 +1,18 @@
# SPDX-License-Identifier: Apache-2.0
-project('phosphor-debug-collector',
- 'cpp',
- meson_version: '>=1.1.1',
- default_options: [
- 'cpp_std=c++23',
- 'warning_level=3',
- 'werror=true',
- 'buildtype=debugoptimized'
- ],
- version: '1.0',
- license: 'Apache-2.0'
- )
+project(
+ 'phosphor-debug-collector',
+ 'cpp',
+ meson_version: '>=1.1.1',
+ default_options: [
+ 'cpp_std=c++23',
+ 'warning_level=3',
+ 'werror=true',
+ 'buildtype=debugoptimized',
+ ],
+ version: '1.0',
+ license: 'Apache-2.0',
+)
cpp = meson.get_compiler('cpp')
@@ -22,7 +23,7 @@
# Checking dependency external library
-libsystemd = dependency('libsystemd', version : '>=221')
+libsystemd = dependency('libsystemd', version: '>=221')
sdbusplus_dep = dependency('sdbusplus')
sdbusplusplus_prog = find_program('sdbus++')
@@ -41,107 +42,155 @@
'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
# Disable FORTIFY_SOURCE when compiling with no optimization
-if(get_option('optimization') == '0')
- add_project_arguments('-U_FORTIFY_SOURCE',language:['cpp','c'])
- message('Disabling FORTIFY_SOURCE as optimization is set to 0')
+if (get_option('optimization') == '0')
+ add_project_arguments('-U_FORTIFY_SOURCE', language: ['cpp', 'c'])
+ message('Disabling FORTIFY_SOURCE as optimization is set to 0')
endif
# Configuration header file(config.h) generation
conf_data = configuration_data()
-conf_data.set_quoted('DUMP_BUSNAME', get_option('DUMP_BUSNAME'),
- description : 'The Dbus busname to own'
- )
-conf_data.set_quoted('DUMP_OBJPATH', get_option('DUMP_OBJPATH'),
- description : 'The Dump manager Dbus root'
- )
-conf_data.set_quoted('BMC_DUMP_OBJPATH', get_option('BMC_DUMP_OBJPATH'),
- description : 'The BMC Dump manager Dbus path'
- )
-conf_data.set_quoted('CORE_FILE_DIR', get_option('CORE_FILE_DIR'),
- description : 'Directory where core dumps are placed'
- )
-conf_data.set_quoted('BMC_DUMP_OBJ_ENTRY', get_option('BMC_DUMP_OBJ_ENTRY'),
- description : 'The BMC dump entry DBus object path'
- )
-conf_data.set_quoted('BMC_DUMP_PATH', get_option('BMC_DUMP_PATH'),
- description : 'Directory where bmc dumps are placed')
-conf_data.set_quoted('SYSTEMD_PSTORE_PATH', get_option('SYSTEMD_PSTORE_PATH'),
- description : 'Path to the systemd pstore directory')
-conf_data.set('BMC_DUMP_MAX_SIZE', get_option('BMC_DUMP_MAX_SIZE'),
- description : 'Maximum size of one bmc dump in kilo bytes'
- )
-conf_data.set('BMC_DUMP_MIN_SPACE_REQD', get_option('BMC_DUMP_MIN_SPACE_REQD'),
- description : 'Minimum space required for one bmc dump in kilo bytes'
- )
-conf_data.set('BMC_DUMP_TOTAL_SIZE', get_option('BMC_DUMP_TOTAL_SIZE'),
- description : 'Total size of the dump in kilo bytes'
- )
-conf_data.set_quoted('OBJ_LOGGING', '/xyz/openbmc_project/logging',
- description : 'The log manager DBus object path'
- )
-conf_data.set_quoted('ELOG_ID_PERSIST_PATH', get_option('ELOG_ID_PERSIST_PATH'),
- description : 'Path of file for storing elog id\'s, which have associated dumps'
- )
-conf_data.set('CLASS_VERSION', get_option('CLASS_VERSION'),
- description : 'Class version to register with Cereal'
- )
-conf_data.set('ERROR_MAP_YAML', get_option('ERROR_MAP_YAML'),
- description : 'YAML filepath containing error object paths'
- )
-conf_data.set('JFFS_CORE_FILE_WORKAROUND', get_option('jffs-workaround').allowed(),
- description : 'Turn on jffs workaround for core file'
- )
-conf_data.set_quoted('FAULTLOG_DUMP_OBJ_ENTRY', get_option('FAULTLOG_DUMP_OBJ_ENTRY'),
- description : 'The Fault Log dump entry DBus object path'
- )
-conf_data.set_quoted('FAULTLOG_DUMP_OBJPATH', get_option('FAULTLOG_DUMP_OBJPATH'),
- description : 'The Fault Log Dump manager Dbus path'
- )
-conf_data.set_quoted('FAULTLOG_DUMP_PATH', get_option('FAULTLOG_DUMP_PATH'),
- description : 'Directory where fault logs are placed'
- )
-conf_data.set('BMC_DUMP_ROTATE_CONFIG', get_option('dump_rotate_config').allowed(),
- description : 'Turn on rotate config for bmc dump'
- )
+conf_data.set_quoted(
+ 'DUMP_BUSNAME',
+ get_option('DUMP_BUSNAME'),
+ description: 'The Dbus busname to own',
+)
+conf_data.set_quoted(
+ 'DUMP_OBJPATH',
+ get_option('DUMP_OBJPATH'),
+ description: 'The Dump manager Dbus root',
+)
+conf_data.set_quoted(
+ 'BMC_DUMP_OBJPATH',
+ get_option('BMC_DUMP_OBJPATH'),
+ description: 'The BMC Dump manager Dbus path',
+)
+conf_data.set_quoted(
+ 'CORE_FILE_DIR',
+ get_option('CORE_FILE_DIR'),
+ description: 'Directory where core dumps are placed',
+)
+conf_data.set_quoted(
+ 'BMC_DUMP_OBJ_ENTRY',
+ get_option('BMC_DUMP_OBJ_ENTRY'),
+ description: 'The BMC dump entry DBus object path',
+)
+conf_data.set_quoted(
+ 'BMC_DUMP_PATH',
+ get_option('BMC_DUMP_PATH'),
+ description: 'Directory where bmc dumps are placed',
+)
+conf_data.set_quoted(
+ 'SYSTEMD_PSTORE_PATH',
+ get_option('SYSTEMD_PSTORE_PATH'),
+ description: 'Path to the systemd pstore directory',
+)
+conf_data.set(
+ 'BMC_DUMP_MAX_SIZE',
+ get_option('BMC_DUMP_MAX_SIZE'),
+ description: 'Maximum size of one bmc dump in kilo bytes',
+)
+conf_data.set(
+ 'BMC_DUMP_MIN_SPACE_REQD',
+ get_option('BMC_DUMP_MIN_SPACE_REQD'),
+ description: 'Minimum space required for one bmc dump in kilo bytes',
+)
+conf_data.set(
+ 'BMC_DUMP_TOTAL_SIZE',
+ get_option('BMC_DUMP_TOTAL_SIZE'),
+ description: 'Total size of the dump in kilo bytes',
+)
+conf_data.set_quoted(
+ 'OBJ_LOGGING',
+ '/xyz/openbmc_project/logging',
+ description: 'The log manager DBus object path',
+)
+conf_data.set_quoted(
+ 'ELOG_ID_PERSIST_PATH',
+ get_option('ELOG_ID_PERSIST_PATH'),
+ description: 'Path of file for storing elog id\'s, which have associated dumps',
+)
+conf_data.set(
+ 'CLASS_VERSION',
+ get_option('CLASS_VERSION'),
+ description: 'Class version to register with Cereal',
+)
+conf_data.set(
+ 'ERROR_MAP_YAML',
+ get_option('ERROR_MAP_YAML'),
+ description: 'YAML filepath containing error object paths',
+)
+conf_data.set(
+ 'JFFS_CORE_FILE_WORKAROUND',
+ get_option('jffs-workaround').allowed(),
+ description: 'Turn on jffs workaround for core file',
+)
+conf_data.set_quoted(
+ 'FAULTLOG_DUMP_OBJ_ENTRY',
+ get_option('FAULTLOG_DUMP_OBJ_ENTRY'),
+ description: 'The Fault Log dump entry DBus object path',
+)
+conf_data.set_quoted(
+ 'FAULTLOG_DUMP_OBJPATH',
+ get_option('FAULTLOG_DUMP_OBJPATH'),
+ description: 'The Fault Log Dump manager Dbus path',
+)
+conf_data.set_quoted(
+ 'FAULTLOG_DUMP_PATH',
+ get_option('FAULTLOG_DUMP_PATH'),
+ description: 'Directory where fault logs are placed',
+)
+conf_data.set(
+ 'BMC_DUMP_ROTATE_CONFIG',
+ get_option('dump_rotate_config').allowed(),
+ description: 'Turn on rotate config for bmc dump',
+)
if cpp.has_header('poll.h')
- add_project_arguments('-DPLDM_HAS_POLL=1', language: 'cpp')
+ add_project_arguments('-DPLDM_HAS_POLL=1', language: 'cpp')
endif
-configure_file(configuration : conf_data,
- output : 'config.h'
- )
+configure_file(configuration: conf_data, output: 'config.h')
dump_types_yaml_files = []
# Dump types YAML file
-dump_types_yaml_files += {'input': 'example_dump_types.yaml',
- 'output': 'dump_types.yaml'}
+dump_types_yaml_files += {
+ 'input': 'example_dump_types.yaml',
+ 'output': 'dump_types.yaml',
+}
# Copy and combine YAML files
concatenate_command = 'cat '
combined_yaml_file = 'combined_dump_types.yaml'
foreach yaml_file : dump_types_yaml_files
- configure_file(input : yaml_file.get('input'),
- output : yaml_file.get('output'),
- copy : true)
- concatenate_command += meson.project_build_root() + '/' + yaml_file.get('output') + ' '
+ configure_file(
+ input: yaml_file.get('input'),
+ output: yaml_file.get('output'),
+ copy: true,
+ )
+ concatenate_command += meson.project_build_root() + '/' + yaml_file.get(
+ 'output',
+ ) + ' '
endforeach
concatenate_command += '> ' + meson.project_build_root() + '/' + combined_yaml_file
@@ -152,74 +201,76 @@
map_gen_file_loc += '/map_gen.py'
dump_types_hpp = custom_target(
- 'dump_types.hpp',
- command : [
- python,
- map_gen_file_loc,
- '-i',
- meson.project_build_root() + '/' + combined_yaml_file,
- '-j',
- get_option('ERROR_MAP_YAML'),
- '-t',
- 'dump_types.hpp.mako',
- '-o',
- 'dump_types.hpp'
- ],
- depend_files : [ 'dump_types.hpp.mako',
- 'map_gen.py',
- meson.project_build_root() + '/' + combined_yaml_file,
- get_option('ERROR_MAP_YAML')
- ],
- output : 'dump_types.hpp'
- )
+ 'dump_types.hpp',
+ command: [
+ python,
+ map_gen_file_loc,
+ '-i',
+ meson.project_build_root() + '/' + combined_yaml_file,
+ '-j',
+ get_option('ERROR_MAP_YAML'),
+ '-t',
+ 'dump_types.hpp.mako',
+ '-o',
+ 'dump_types.hpp',
+ ],
+ depend_files: [
+ 'dump_types.hpp.mako',
+ 'map_gen.py',
+ meson.project_build_root() + '/' + combined_yaml_file,
+ get_option('ERROR_MAP_YAML'),
+ ],
+ output: 'dump_types.hpp',
+)
dump_types_cpp = custom_target(
- 'dump_types.cpp',
- command : [
- python,
- map_gen_file_loc,
- '-i',
- meson.project_build_root() + '/' + combined_yaml_file,
- '-j',
- get_option('ERROR_MAP_YAML'),
- '-t',
- 'dump_types.cpp.mako',
- '-o',
- 'dump_types.cpp'
- ],
- depend_files : [ 'dump_types.cpp.mako',
- 'map_gen.py',
- meson.project_build_root() + '/' + combined_yaml_file,
- get_option('ERROR_MAP_YAML')
- ],
- output : 'dump_types.cpp'
- )
+ 'dump_types.cpp',
+ command: [
+ python,
+ map_gen_file_loc,
+ '-i',
+ meson.project_build_root() + '/' + combined_yaml_file,
+ '-j',
+ get_option('ERROR_MAP_YAML'),
+ '-t',
+ 'dump_types.cpp.mako',
+ '-o',
+ 'dump_types.cpp',
+ ],
+ depend_files: [
+ 'dump_types.cpp.mako',
+ 'map_gen.py',
+ meson.project_build_root() + '/' + combined_yaml_file,
+ get_option('ERROR_MAP_YAML'),
+ ],
+ output: 'dump_types.cpp',
+)
phosphor_dump_manager_sources = [
- 'dump_entry.cpp',
- 'dump_manager.cpp',
- 'dump_manager_bmc.cpp',
- 'dump_manager_main.cpp',
- 'dump_serialize.cpp',
- 'elog_watch.cpp',
- dump_types_hpp,
- dump_types_cpp,
- 'watch.cpp',
- 'bmc_dump_entry.cpp',
- 'dump_utils.cpp',
- 'dump_offload.cpp',
- 'dump_manager_faultlog.cpp',
- 'faultlog_dump_entry.cpp'
- ]
+ 'dump_entry.cpp',
+ 'dump_manager.cpp',
+ 'dump_manager_bmc.cpp',
+ 'dump_manager_main.cpp',
+ 'dump_serialize.cpp',
+ 'elog_watch.cpp',
+ dump_types_hpp,
+ dump_types_cpp,
+ 'watch.cpp',
+ 'bmc_dump_entry.cpp',
+ 'dump_utils.cpp',
+ 'dump_offload.cpp',
+ 'dump_manager_faultlog.cpp',
+ 'faultlog_dump_entry.cpp',
+]
phosphor_dump_manager_dependency = [
- phosphor_dbus_interfaces_dep,
- sdbusplus_dep,
- sdeventplus_dep,
- phosphor_logging_dep,
- cereal_dep,
- nlohmann_json_dep,
- ]
+ phosphor_dbus_interfaces_dep,
+ sdbusplus_dep,
+ sdeventplus_dep,
+ phosphor_logging_dep,
+ cereal_dep,
+ nlohmann_json_dep,
+]
phosphor_dump_manager_install = true
@@ -234,84 +285,89 @@
subdir('dump-extensions')
phosphor_dump_monitor_sources = [
- dump_types_hpp,
- 'core_manager.cpp',
- 'core_manager_main.cpp',
- 'watch.cpp'
- ]
+ dump_types_hpp,
+ 'core_manager.cpp',
+ 'core_manager_main.cpp',
+ 'watch.cpp',
+]
phosphor_dump_monitor_dependency = [
- phosphor_dbus_interfaces_dep,
- phosphor_logging_dep,
- sdeventplus_dep,
- ]
+ phosphor_dbus_interfaces_dep,
+ phosphor_logging_dep,
+ sdeventplus_dep,
+]
phosphor_dump_monitor_install = true
phosphor_dump_monitor_incdir = []
phosphor_ramoops_monitor_sources = [
- dump_types_hpp,
- 'ramoops_manager.cpp',
- 'ramoops_manager_main.cpp',
- 'watch.cpp'
- ]
+ dump_types_hpp,
+ 'ramoops_manager.cpp',
+ 'ramoops_manager_main.cpp',
+ 'watch.cpp',
+]
phosphor_ramoops_monitor_dependency = [
- phosphor_dbus_interfaces_dep,
- phosphor_logging_dep,
- sdeventplus_dep,
- ]
+ phosphor_dbus_interfaces_dep,
+ phosphor_logging_dep,
+ sdeventplus_dep,
+]
phosphor_ramoops_monitor_install = true
phosphor_ramoops_monitor_incdir = []
-executables = [[ 'phosphor-dump-manager',
- phosphor_dump_manager_sources,
- phosphor_dump_manager_dependency,
- phosphor_dump_manager_install,
- phosphor_dump_manager_incdir
- ],
- [ 'phosphor-dump-monitor',
- phosphor_dump_monitor_sources,
- phosphor_dump_monitor_dependency,
- phosphor_dump_monitor_install,
- phosphor_dump_monitor_incdir
- ],
- [ 'phosphor-ramoops-monitor',
- phosphor_ramoops_monitor_sources,
- phosphor_ramoops_monitor_dependency,
- phosphor_ramoops_monitor_install,
- phosphor_ramoops_monitor_incdir
- ]
- ]
+executables = [
+ [
+ 'phosphor-dump-manager',
+ phosphor_dump_manager_sources,
+ phosphor_dump_manager_dependency,
+ phosphor_dump_manager_install,
+ phosphor_dump_manager_incdir,
+ ],
+ [
+ 'phosphor-dump-monitor',
+ phosphor_dump_monitor_sources,
+ phosphor_dump_monitor_dependency,
+ phosphor_dump_monitor_install,
+ phosphor_dump_monitor_incdir,
+ ],
+ [
+ 'phosphor-ramoops-monitor',
+ phosphor_ramoops_monitor_sources,
+ phosphor_ramoops_monitor_dependency,
+ phosphor_ramoops_monitor_install,
+ phosphor_ramoops_monitor_incdir,
+ ],
+]
foreach executable : executables
binary = executable(
- executable[0],
- executable[1],
- dependencies: executable[2],
- install : executable[3],
- include_directories : executable[4]
- )
+ executable[0],
+ executable[1],
+ dependencies: executable[2],
+ install: executable[3],
+ include_directories: executable[4],
+ )
endforeach
unit_subs = configuration_data()
unit_subs.set('bindir', join_paths(get_option('prefix'), get_option('bindir')))
systemd_system_unit_dir = dependency('systemd').get_variable(
'systemdsystemunitdir',
- pkgconfig_define: ['prefix', get_option('prefix')])
+ pkgconfig_define: ['prefix', get_option('prefix')],
+)
foreach u : unit_files
configure_file(
configuration: unit_subs,
input: u.get('input'),
install: true,
install_dir: systemd_system_unit_dir,
- output: u.get('output')
+ output: u.get('output'),
)
endforeach
if get_option('tests').allowed()
- subdir('test')
+ subdir('test')
endif