meson: reformat with meson formatter
Apply the `meson format` results.
Change-Id: I73471b8ae6b57b537b4879f52f5db3c7c06f30f0
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meson.build b/meson.build
index 8ef85e0..cbe0e81 100644
--- a/meson.build
+++ b/meson.build
@@ -1,49 +1,77 @@
-project('phosphor-user-manager',
- 'cpp',
- version: '0.1', meson_version: '>=1.1.1',
- default_options: [
- 'warning_level=3',
- 'werror=true',
- 'cpp_std=c++23',
- 'buildtype=debugoptimized',
- ]
+project(
+ 'phosphor-user-manager',
+ 'cpp',
+ version: '0.1',
+ meson_version: '>=1.1.1',
+ default_options: [
+ 'warning_level=3',
+ 'werror=true',
+ 'cpp_std=c++23',
+ 'buildtype=debugoptimized',
+ ],
)
if get_option('root_user_mgmt').allowed()
- add_project_arguments('-DENABLE_ROOT_USER_MGMT', language:'cpp')
+ add_project_arguments('-DENABLE_ROOT_USER_MGMT', language: 'cpp')
endif
conf_data = configuration_data()
-conf_data.set_quoted('USER_MANAGER_BUSNAME', 'xyz.openbmc_project.User.Manager',
- description : 'The DBus busname to own.')
+conf_data.set_quoted(
+ 'USER_MANAGER_BUSNAME',
+ 'xyz.openbmc_project.User.Manager',
+ description: 'The DBus busname to own.',
+)
-conf_data.set('CLASS_VERSION', 1,
- description : 'Class version to register with Cereal.')
+conf_data.set(
+ 'CLASS_VERSION',
+ 1,
+ description: 'Class version to register with Cereal.',
+)
-conf_data.set_quoted('LDAP_CONFIG_FILE', '/etc/nslcd.conf',
- description : 'Path of LDAP configuration file.')
+conf_data.set_quoted(
+ 'LDAP_CONFIG_FILE',
+ '/etc/nslcd.conf',
+ description: 'Path of LDAP configuration file.',
+)
-conf_data.set_quoted('TLS_CACERT_PATH', '/etc/ssl/certs/authority',
- description : 'Path of LDAP server CA certificate.')
+conf_data.set_quoted(
+ 'TLS_CACERT_PATH',
+ '/etc/ssl/certs/authority',
+ description: 'Path of LDAP server CA certificate.',
+)
-conf_data.set_quoted('TLS_CERT_FILE', '/etc/nslcd/certs/cert.pem',
- description : 'Path of LDAP client certificate.')
+conf_data.set_quoted(
+ 'TLS_CERT_FILE',
+ '/etc/nslcd/certs/cert.pem',
+ description: 'Path of LDAP client certificate.',
+)
-conf_data.set_quoted('LDAP_CONFIG_ROOT', '/xyz/openbmc_project/user/ldap',
- description : 'LDAP configuration root.')
+conf_data.set_quoted(
+ 'LDAP_CONFIG_ROOT',
+ '/xyz/openbmc_project/user/ldap',
+ description: 'LDAP configuration root.',
+)
-conf_data.set_quoted('LDAP_CONFIG_DBUS_OBJ_PATH', '/xyz/openbmc_project/user/ldap/config',
- description : 'D-Bus path of LDAP config object.')
+conf_data.set_quoted(
+ 'LDAP_CONFIG_DBUS_OBJ_PATH',
+ '/xyz/openbmc_project/user/ldap/config',
+ description: 'D-Bus path of LDAP config object.',
+)
-conf_data.set_quoted('LDAP_CONFIG_BUSNAME', 'xyz.openbmc_project.Ldap.Config',
- description : 'D-Bus busname of LDAP config service.')
+conf_data.set_quoted(
+ 'LDAP_CONFIG_BUSNAME',
+ 'xyz.openbmc_project.Ldap.Config',
+ description: 'D-Bus busname of LDAP config service.',
+)
-conf_data.set_quoted('LDAP_CONF_PERSIST_PATH', '/var/lib/phosphor-ldap-conf',
- description : 'path of directory having persisted LDAP configuration enabled property.')
+conf_data.set_quoted(
+ 'LDAP_CONF_PERSIST_PATH',
+ '/var/lib/phosphor-ldap-conf',
+ description: 'path of directory having persisted LDAP configuration enabled property.',
+)
-conf_header = configure_file(output: 'config.h',
- configuration: conf_data)
+conf_header = configure_file(output: 'config.h', configuration: conf_data)
phosphor_dbus_interfaces_dep = dependency('phosphor-dbus-interfaces')
sdbusplus_dep = dependency('sdbusplus')
@@ -60,58 +88,57 @@
'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
-user_manager_src = [
- 'mainapp.cpp',
- 'user_mgr.cpp',
- 'users.cpp'
-]
+user_manager_src = ['mainapp.cpp', 'user_mgr.cpp', 'users.cpp']
user_manager_deps = [
- boost_dep,
- sdbusplus_dep,
- phosphor_logging_dep,
- phosphor_dbus_interfaces_dep
+ boost_dep,
+ sdbusplus_dep,
+ phosphor_logging_dep,
+ phosphor_dbus_interfaces_dep,
]
user_manager_lib = static_library(
'phosphor-user-manager',
- [
- 'user_mgr.cpp',
- 'users.cpp',
- ],
+ ['user_mgr.cpp', 'users.cpp'],
dependencies: user_manager_deps,
)
user_manager_dep = declare_dependency(
link_with: user_manager_lib,
- dependencies: user_manager_deps
+ dependencies: user_manager_deps,
)
executable(
'phosphor-user-manager',
'mainapp.cpp',
dependencies: user_manager_dep,
- link_args: ['-lcrypt' ],
- cpp_args: ['-DBOOST_ALL_NO_LIB', '-DBOOST_SYSTEM_NO_DEPRECATED', '-DBOOST_ERROR_CODE_HEADER_ONLY'],
+ link_args: ['-lcrypt'],
+ cpp_args: [
+ '-DBOOST_ALL_NO_LIB',
+ '-DBOOST_SYSTEM_NO_DEPRECATED',
+ '-DBOOST_ERROR_CODE_HEADER_ONLY',
+ ],
install: true,
)
-systemd_system_unit_dir = systemd_dep.get_variable(
- 'systemdsystemunitdir'
-)
+systemd_system_unit_dir = systemd_dep.get_variable('systemdsystemunitdir')
install_data(
'phosphor-nslcd-cert-config.conf',
@@ -131,19 +158,25 @@
# pointing_to: systemd_system_unit_dir / 'phosphor-certificate-manager@.service',
# )
meson.add_install_script(
- 'sh', '-c',
- 'mkdir -p $(dirname $DESTDIR/@0@/@1@)'.format(systemd_system_unit_dir,
- 'multi-user.target.wants/phosphor-certificate-manager@nslcd.service'),
+ 'sh',
+ '-c',
+ 'mkdir -p $(dirname $DESTDIR/@0@/@1@)'.format(
+ systemd_system_unit_dir,
+ 'multi-user.target.wants/phosphor-certificate-manager@nslcd.service',
+ ),
)
meson.add_install_script(
- 'sh', '-c',
- 'ln -s @0@ $DESTDIR/@1@/@2@'.format('../phosphor-certificate-manager@.service',
+ 'sh',
+ '-c',
+ 'ln -s @0@ $DESTDIR/@1@/@2@'.format(
+ '../phosphor-certificate-manager@.service',
systemd_system_unit_dir,
- 'multi-user.target.wants/phosphor-certificate-manager@nslcd.service'),
+ 'multi-user.target.wants/phosphor-certificate-manager@nslcd.service',
+ ),
)
subdir('phosphor-ldap-config')
if get_option('tests').allowed()
- subdir('test')
+ subdir('test')
endif
diff --git a/meson.options b/meson.options
index b68ef14..ace1bdd 100644
--- a/meson.options
+++ b/meson.options
@@ -1,2 +1,7 @@
option('tests', type: 'feature', description: 'Build tests', value: 'enabled')
-option('root_user_mgmt', type: 'feature', description: 'Enable management of the root user', value: 'enabled')
+option(
+ 'root_user_mgmt',
+ type: 'feature',
+ description: 'Enable management of the root user',
+ value: 'enabled',
+)
diff --git a/phosphor-ldap-config/meson.build b/phosphor-ldap-config/meson.build
index 24060ea..2f79486 100644
--- a/phosphor-ldap-config/meson.build
+++ b/phosphor-ldap-config/meson.build
@@ -16,7 +16,7 @@
'ldap_config.cpp',
'ldap_config_mgr.cpp',
'ldap_mapper_entry.cpp',
- 'ldap_mapper_serialize.cpp'
+ 'ldap_mapper_serialize.cpp',
],
include_directories: '..',
dependencies: phosphor_ldap_conf_deps,
diff --git a/subprojects/packagefiles/boost/meson.build b/subprojects/packagefiles/boost/meson.build
index 2caabf5..6935475 100644
--- a/subprojects/packagefiles/boost/meson.build
+++ b/subprojects/packagefiles/boost/meson.build
@@ -1,11 +1,5 @@
-project('boost',
- 'cpp',
- version : '1.84.0',
- license : 'Boost'
-)
+project('boost', 'cpp', version: '1.84.0', license: 'Boost')
-boost_dep = declare_dependency(
- include_directories : include_directories('.'),
-)
+boost_dep = declare_dependency(include_directories: include_directories('.'))
meson.override_dependency('boost', boost_dep)
diff --git a/test/meson.build b/test/meson.build
index 94b8b0f..61965df 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -8,13 +8,13 @@
dependency('threads'),
gtest_proj.dependency('gtest'),
gtest_proj.dependency('gtest_main'),
- ]
+ ],
)
gmock_dep = gtest_proj.dependency('gmock')
else
assert(
not get_option('tests').allowed(),
- 'Googletest is required if tests are enabled'
+ 'Googletest is required if tests are enabled',
)
endif
endif
@@ -23,14 +23,9 @@
'ldap_config_test',
executable(
'ldap_config_test',
- ['ldap_config_test.cpp',
- 'utils_test.cpp'],
+ ['ldap_config_test.cpp', 'utils_test.cpp'],
include_directories: '..',
- dependencies: [
- gtest_dep,
- gmock_dep,
- phosphor_ldap_conf_dep,
- ],
+ dependencies: [gtest_dep, gmock_dep, phosphor_ldap_conf_dep],
link_args: ['-lldap'],
),
)
@@ -41,10 +36,6 @@
'user_mgr_test',
'user_mgr_test.cpp',
include_directories: '..',
- dependencies: [
- gtest_dep,
- gmock_dep,
- user_manager_dep,
- ],
+ dependencies: [gtest_dep, gmock_dep, user_manager_dep],
),
)