meson: reformat with meson formatter
Apply the `meson format` results.
Change-Id: I5d70e61343fa6773099ff1a195e21aeb44b7fa5a
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/bmc-vmi-ca/meson.build b/bmc-vmi-ca/meson.build
index 8871008..12f6f85 100644
--- a/bmc-vmi-ca/meson.build
+++ b/bmc-vmi-ca/meson.build
@@ -6,10 +6,7 @@
bmc_vmi_ca_lib = static_library(
'bmc_vmi_ca',
- [
- 'ca_cert_entry.cpp',
- 'ca_certs_manager.cpp',
- ],
+ ['ca_cert_entry.cpp', 'ca_certs_manager.cpp'],
include_directories: '..',
dependencies: bmc_vmi_ca_deps,
)
diff --git a/dist/meson.build b/dist/meson.build
index b6dda42..bfcd0f4 100644
--- a/dist/meson.build
+++ b/dist/meson.build
@@ -1,12 +1,10 @@
-systemd_system_unit_dir = systemd_dep.get_variable(
- 'systemdsystemunitdir'
-)
+systemd_system_unit_dir = systemd_dep.get_variable('systemdsystemunitdir')
busconfig_dir = get_option('datadir') / 'dbus-1' / 'system.d'
cert_manager_dir = get_option('datadir') / 'phosphor-certificate-manager'
certs = []
busconfig = []
-service_files = [ 'phosphor-certificate-manager@.service' ]
+service_files = ['phosphor-certificate-manager@.service']
systemd_alias = []
if not get_option('ca-cert-extension').disabled()
@@ -17,37 +15,32 @@
if not get_option('config-bmcweb').disabled()
busconfig += 'busconfig/phosphor-bmcweb-cert-config.conf'
certs += 'env/bmcweb'
- systemd_alias += [[
- '../phosphor-certificate-manager@.service',
- 'multi-user.target.wants/phosphor-certificate-manager@bmcweb.service'
- ]]
+ systemd_alias += [
+ [
+ '../phosphor-certificate-manager@.service',
+ 'multi-user.target.wants/phosphor-certificate-manager@bmcweb.service',
+ ],
+ ]
endif
if not get_option('config-authority').disabled()
busconfig += 'busconfig/phosphor-authority-cert-config.conf'
certs += 'env/authority'
- systemd_alias += [[
- '../phosphor-certificate-manager@.service',
- 'multi-user.target.wants/phosphor-certificate-manager@authority.service'
- ]]
+ systemd_alias += [
+ [
+ '../phosphor-certificate-manager@.service',
+ 'multi-user.target.wants/phosphor-certificate-manager@authority.service',
+ ],
+ ]
endif
-install_data(
- service_files,
- install_dir: systemd_system_unit_dir,
-)
+install_data(service_files, install_dir: systemd_system_unit_dir)
-install_data(
- busconfig,
- install_dir: busconfig_dir,
-)
+install_data(busconfig, install_dir: busconfig_dir)
-install_data(
- certs,
- install_dir: cert_manager_dir,
-)
+install_data(certs, install_dir: cert_manager_dir)
-foreach service: systemd_alias
+foreach service : systemd_alias
# Meson 0.61 will support this:
#install_symlink(
# service,
@@ -55,13 +48,20 @@
# pointing_to: link,
# )
meson.add_install_script(
- 'sh', '-c',
- 'mkdir -p $(dirname $DESTDIR/@0@/@1@)'.format(systemd_system_unit_dir,
- service[1]),
+ 'sh',
+ '-c',
+ 'mkdir -p $(dirname $DESTDIR/@0@/@1@)'.format(
+ systemd_system_unit_dir,
+ service[1],
+ ),
)
meson.add_install_script(
- 'sh', '-c',
- 'ln -s @0@ $DESTDIR/@1@/@2@'.format(service[0], systemd_system_unit_dir,
- service[1]),
+ 'sh',
+ '-c',
+ 'ln -s @0@ $DESTDIR/@1@/@2@'.format(
+ service[0],
+ systemd_system_unit_dir,
+ service[1],
+ ),
)
endforeach
diff --git a/meson.build b/meson.build
index ab19da5..a4b5281 100644
--- a/meson.build
+++ b/meson.build
@@ -19,39 +19,34 @@
cli11_dep = dependency('cli11', required: false)
has_cli11 = meson.get_compiler('cpp').has_header_symbol(
- 'CLI/CLI.hpp',
- 'CLI::App',
- dependencies: cli11_dep,
- required: false)
+ 'CLI/CLI.hpp',
+ 'CLI::App',
+ dependencies: cli11_dep,
+ required: false,
+)
if not has_cli11
- cli11_proj = subproject('cli11', required: false)
- assert(cli11_proj.found(), 'CLI11 is required')
- cli11_dep = cli11_proj.get_variable('CLI11_dep')
+ cli11_proj = subproject('cli11', required: false)
+ assert(cli11_proj.found(), 'CLI11 is required')
+ cli11_dep = cli11_proj.get_variable('CLI11_dep')
endif
systemd_dep = dependency('systemd')
openssl_dep = dependency('openssl')
config_data = configuration_data()
-config_data.set(
- 'authority_limit',
- get_option('authority-limit')
-)
-config_data.set(
- 'authorities_list_name',
- get_option('authorities-list-name')
-)
+config_data.set('authority_limit', get_option('authority-limit'))
+config_data.set('authorities_list_name', get_option('authorities-list-name'))
if not get_option('allow-expired').disabled()
- config_data.set('allow_expired', 'true')
+ config_data.set('allow_expired', 'true')
else
- config_data.set('allow_expired', 'false')
+ config_data.set('allow_expired', 'false')
endif
configure_file(
input: 'config.h.in',
output: 'config.h',
- configuration: config_data
+ configuration: config_data,
)
phosphor_certificate_deps = [
@@ -78,7 +73,7 @@
cert_manager_dep = declare_dependency(
link_with: cert_manager_lib,
- dependencies: phosphor_certificate_deps
+ dependencies: phosphor_certificate_deps,
)
executable(
@@ -89,7 +84,7 @@
)
if not get_option('ca-cert-extension').disabled()
- subdir('bmc-vmi-ca')
+ subdir('bmc-vmi-ca')
endif
subdir('dist')
diff --git a/meson.options b/meson.options
index 9cf15e4..35752e6 100644
--- a/meson.options
+++ b/meson.options
@@ -1,33 +1,39 @@
option('tests', type: 'feature', description: 'Build tests')
-option('authority-limit',
+option(
+ 'authority-limit',
type: 'integer',
value: 10,
description: 'Authority certificates limit',
)
-option('ca-cert-extension',
+option(
+ 'ca-cert-extension',
type: 'feature',
- description: 'Enable CA certificate manager (IBM specific)'
+ description: 'Enable CA certificate manager (IBM specific)',
)
-option('config-bmcweb',
+option(
+ 'config-bmcweb',
type: 'feature',
description: 'Install bmcweb cert configs',
)
-option('config-authority',
+option(
+ 'config-authority',
type: 'feature',
description: 'Install authority cert configs',
)
-option('authorities-list-name',
+option(
+ 'authorities-list-name',
type: 'string',
value: 'trust_bundle',
description: 'File name of the authorities list',
)
-option('allow-expired',
+option(
+ 'allow-expired',
type: 'feature',
value: 'enabled',
description: 'Allow expired certificates',
diff --git a/test/meson.build b/test/meson.build
index d90822b..425cc2a 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').enabled(),
- 'Googletest is required if tests are enabled'
+ 'Googletest is required if tests are enabled',
)
endif
endif
@@ -25,11 +25,7 @@
'argument_test',
'argument_test.cpp',
include_directories: '..',
- dependencies: [
- gtest_dep,
- gmock_dep,
- cert_manager_dep,
- ],
+ dependencies: [gtest_dep, gmock_dep, cert_manager_dep],
),
)
@@ -39,14 +35,10 @@
'test-certs-manager',
'certs_manager_test.cpp',
include_directories: '..',
- dependencies: [
- gtest_dep,
- gmock_dep,
- cert_manager_dep,
- ],
+ dependencies: [gtest_dep, gmock_dep, cert_manager_dep],
),
- timeout: 500, # Takes about 1 minute to generate all the certs.
- # considering valgrind enabled path setting up this 500 sec.
+ timeout: 500, # Takes about 1 minute to generate all the certs.
+ # considering valgrind enabled path setting up this 500 sec.
)
if not get_option('ca-cert-extension').disabled()
@@ -56,11 +48,7 @@
'test-ca-certs-manager',
'ca_certs_manager_test.cpp',
include_directories: '..',
- dependencies: [
- gtest_dep,
- gmock_dep,
- bmc_vmi_ca_dep,
- ],
+ dependencies: [gtest_dep, gmock_dep, bmc_vmi_ca_dep],
),
)
endif