meson: reformat with meson formatter
Apply the `meson format` results.
Change-Id: Iab5fdd6b41eab1cc138df39f1dce5345bf260306
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meson.build b/meson.build
index b704687..f789a0d 100644
--- a/meson.build
+++ b/meson.build
@@ -1,11 +1,7 @@
project(
'entity-manager',
'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: '0.1',
meson_version: '>=1.1.1',
@@ -19,24 +15,25 @@
'-DBOOST_NO_RTTI',
'-DBOOST_NO_TYPEID',
'-DBOOST_ALL_NO_LIB',
- '-DBOOST_ALLOW_DEPRECATED_HEADERS'
+ '-DBOOST_ALLOW_DEPRECATED_HEADERS',
]
build_tests = get_option('tests')
cpp = meson.get_compiler('cpp')
boost = dependency('boost', required: false)
if not boost.found()
- subproject('boost', required: false)
- boost = declare_dependency(
- include_directories: 'subprojects/boost_1_71_0',
- )
- boost = boost.as_system('system')
+ subproject('boost', required: false)
+ boost = declare_dependency(include_directories: 'subprojects/boost_1_71_0')
+ boost = boost.as_system('system')
endif
if get_option('fru-device')
i2c = cpp.find_library('i2c')
endif
if get_option('devicetree-vpd')
- phosphor_dbus_interfaces_dep = dependency('phosphor-dbus-interfaces', include_type: 'system')
+ phosphor_dbus_interfaces_dep = dependency(
+ 'phosphor-dbus-interfaces',
+ include_type: 'system',
+ )
endif
nlohmann_json_dep = dependency('nlohmann_json', include_type: 'system')
@@ -46,7 +43,8 @@
systemd = dependency('systemd')
systemd_system_unit_dir = systemd.get_variable(
'systemdsystemunitdir',
- pkgconfig_define: ['prefix', get_option('prefix')])
+ pkgconfig_define: ['prefix', get_option('prefix')],
+)
packagedir = join_paths(
get_option('prefix'),
get_option('datadir'),
@@ -63,7 +61,7 @@
else
subproject('valijson', required: false)
valijson = declare_dependency(
- include_directories: 'subprojects/valijson/include'
+ include_directories: 'subprojects/valijson/include',
)
valijson = valijson.as_system('system')
endif
@@ -76,29 +74,19 @@
filepaths = []
foreach c : configs
file = join_paths('configurations', c)
- install_data(
- file,
- install_dir: join_paths(
- packagedir,
- 'configurations',
- )
- )
+ install_data(file, install_dir: join_paths(packagedir, 'configurations'))
filepaths += [file]
endforeach
if get_option('validate-json')
validate_script = files('scripts/validate_configs.py')
autojson = custom_target(
- 'check_syntax',
- command: [
- validate_script,
- '-v',
- '-k',
- ],
- depend_files: files(filepaths),
- build_by_default: true,
- capture: true,
- output: 'validate_configs.log',
+ 'check_syntax',
+ command: [validate_script, '-v', '-k'],
+ depend_files: files(filepaths),
+ build_by_default: true,
+ capture: true,
+ output: 'validate_configs.log',
)
endif
@@ -121,11 +109,7 @@
foreach s : schemas
install_data(
join_paths('schemas', s),
- install_dir: join_paths(
- packagedir,
- 'configurations',
- 'schemas',
- )
+ install_dir: join_paths(packagedir, 'configurations', 'schemas'),
)
endforeach
@@ -141,7 +125,9 @@
gtest_subproject = cmake.subproject('gtest')
cm_gtest = gtest_subproject.dependency('gtest')
cm_gtest_main = gtest_subproject.dependency('gtest_main')
- gtest = declare_dependency(dependencies: [cm_gtest, cm_gtest_main, threads])
+ gtest = declare_dependency(
+ dependencies: [cm_gtest, cm_gtest_main, threads],
+ )
gmock = gtest_subproject.dependency('gmock')
endif
@@ -163,7 +149,7 @@
valijson,
],
include_directories: 'src',
- )
+ ),
)
test(
@@ -174,14 +160,9 @@
'src/fru_utils.cpp',
'src/fru_reader.cpp',
cpp_args: test_boost_args,
- dependencies: [
- boost,
- gtest,
- phosphor_logging_dep,
- sdbusplus,
- ],
+ dependencies: [boost, gtest, phosphor_logging_dep, sdbusplus],
include_directories: 'src',
- )
+ ),
)
test(
@@ -198,6 +179,6 @@
phosphor_logging_dep,
],
include_directories: 'src',
- )
+ ),
)
endif
diff --git a/meson.options b/meson.options
new file mode 100644
index 0000000..65c1f97
--- /dev/null
+++ b/meson.options
@@ -0,0 +1,30 @@
+option('tests', type: 'feature', description: 'Build tests.')
+option(
+ 'fru-device',
+ type: 'boolean',
+ description: 'Build fru-device VPD parser.',
+)
+option(
+ 'fru-device-resizefru',
+ value: false,
+ type: 'boolean',
+ description: 'Allow FruDevice to resize FRU areas.',
+)
+option(
+ 'fru-device-16bitdetectmode',
+ type: 'combo',
+ choices: ['MODE_1', 'MODE_2'],
+ value: 'MODE_1',
+ description: 'Different modes to detect 16-bit address EEPROM devices. MODE_1 is current and default mode.',
+)
+option(
+ 'devicetree-vpd',
+ type: 'boolean',
+ description: 'Build device-tree VPD parser',
+)
+option(
+ 'validate-json',
+ type: 'boolean',
+ value: true,
+ description: 'Run JSON schema validation during the build.',
+)
diff --git a/meson_options.txt b/meson_options.txt
deleted file mode 100644
index 363a900..0000000
--- a/meson_options.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-option(
- 'tests', type: 'feature', description: 'Build tests.',
-)
-option(
- 'fru-device', type: 'boolean', description: 'Build fru-device VPD parser.',
-)
-option(
- 'fru-device-resizefru', value : false, type: 'boolean', description: 'Allow FruDevice to resize FRU areas.',
-)
-option(
- 'fru-device-16bitdetectmode', type: 'combo', choices: ['MODE_1', 'MODE_2'], value: 'MODE_1', description: 'Different modes to detect 16-bit address EEPROM devices. MODE_1 is current and default mode.',
-)
-option(
- 'devicetree-vpd', type: 'boolean', description: 'Build device-tree VPD parser'
-)
-option(
- 'validate-json', type: 'boolean', value: true, description: 'Run JSON schema validation during the build.',
-)
diff --git a/service_files/meson.build b/service_files/meson.build
index c145401..8576ba0 100644
--- a/service_files/meson.build
+++ b/service_files/meson.build
@@ -18,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.EntityManager.service',
- install_dir: dbus_system_bus_services_dir)
+ install_dir: dbus_system_bus_services_dir,
+)
diff --git a/src/meson.build b/src/meson.build
index c911861..f4b96a8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,5 +1,5 @@
cpp_args = boost_args + ['-DPACKAGE_DIR="' + packagedir + '/"']
-cpp_args += ['-DSYSCONF_DIR="' + sysconfdir + '/"' ]
+cpp_args += ['-DSYSCONF_DIR="' + sysconfdir + '/"']
installdir = join_paths(get_option('libexecdir'), 'entity-manager')
executable(
@@ -59,10 +59,7 @@
'machine_context.cpp',
'devicetree_vpd_parser.cpp',
cpp_args: cpp_args_fd,
- dependencies: [
- sdbusplus,
- phosphor_dbus_interfaces_dep,
- ],
+ dependencies: [sdbusplus, phosphor_dbus_interfaces_dep],
install: true,
install_dir: installdir,
)