build: fix formatting of Meson lists

Running "./devtools/check-meson.py --fix" on the DPDK repo fixes a
number of issues with whitespace and formatting of files:

* indentation of lists
* missing trailing commas on final list element
* multiple list entries per line when list is not all single-line

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
This commit is contained in:
Bruce Richardson 2021-04-26 11:54:03 +01:00 committed by Thomas Monjalon
parent 1ba12b7509
commit 7d5cfaa750
28 changed files with 53 additions and 49 deletions

View File

@ -14,6 +14,6 @@ sources = files(
'test_perf_queue.c', 'test_perf_queue.c',
'test_pipeline_atq.c', 'test_pipeline_atq.c',
'test_pipeline_common.c', 'test_pipeline_common.c',
'test_pipeline_queue.c' 'test_pipeline_queue.c',
) )
deps += 'eventdev' deps += 'eventdev'

View File

@ -21,7 +21,7 @@ sources = files(
'portal/dpaa2_hw_dpci.c', 'portal/dpaa2_hw_dpci.c',
'portal/dpaa2_hw_dpio.c', 'portal/dpaa2_hw_dpio.c',
'qbman/qbman_portal.c', 'qbman/qbman_portal.c',
'qbman/qbman_debug.c' 'qbman/qbman_debug.c',
) )
includes += include_directories('mc', 'qbman/include', 'portal') includes += include_directories('mc', 'qbman/include', 'portal')

View File

@ -23,7 +23,7 @@ cflags_options = [
'-Wno-strict-prototypes', '-Wno-strict-prototypes',
'-D_BSD_SOURCE', '-D_BSD_SOURCE',
'-D_DEFAULT_SOURCE', '-D_DEFAULT_SOURCE',
'-D_XOPEN_SOURCE=600' '-D_XOPEN_SOURCE=600',
] ]
foreach option:cflags_options foreach option:cflags_options
if cc.has_argument(option) if cc.has_argument(option)

View File

@ -70,7 +70,7 @@ extra_flags = [
'-Wno-unused-parameter', '-Wno-unused-parameter',
'-Wno-unused-variable', '-Wno-unused-variable',
'-Wno-empty-body', '-Wno-empty-body',
'-Wno-unused-but-set-variable' '-Wno-unused-but-set-variable',
] ]
c_args = cflags c_args = cflags

View File

@ -19,13 +19,13 @@ extra_flags = []
# Enable more warnings # Enable more warnings
extra_flags += [ extra_flags += [
'-Wdisabled-optimization' '-Wdisabled-optimization',
] ]
# Compiler and version dependent flags # Compiler and version dependent flags
extra_flags += [ extra_flags += [
'-Waggregate-return', '-Waggregate-return',
'-Wbad-function-cast' '-Wbad-function-cast',
] ]
foreach flag: extra_flags foreach flag: extra_flags

View File

@ -17,7 +17,7 @@ cflags_options = [
'-Wno-strict-prototypes', '-Wno-strict-prototypes',
'-D_BSD_SOURCE', '-D_BSD_SOURCE',
'-D_DEFAULT_SOURCE', '-D_DEFAULT_SOURCE',
'-D_XOPEN_SOURCE=600' '-D_XOPEN_SOURCE=600',
] ]
foreach option:cflags_options foreach option:cflags_options
if cc.has_argument(option) if cc.has_argument(option)

View File

@ -16,5 +16,5 @@ sources = files(
'bcmfs_sym_capabilities.c', 'bcmfs_sym_capabilities.c',
'bcmfs_sym_session.c', 'bcmfs_sym_session.c',
'bcmfs_sym.c', 'bcmfs_sym.c',
'bcmfs_sym_engine.c' 'bcmfs_sym_engine.c',
) )

View File

@ -14,5 +14,5 @@ sources = files(
'nitrox_sym.c', 'nitrox_sym.c',
'nitrox_sym_capabilities.c', 'nitrox_sym_capabilities.c',
'nitrox_sym_reqmgr.c', 'nitrox_sym_reqmgr.c',
'nitrox_qp.c' 'nitrox_qp.c',
) )

View File

@ -19,7 +19,7 @@ sources = [
'e1000_nvm.c', 'e1000_nvm.c',
'e1000_osdep.c', 'e1000_osdep.c',
'e1000_phy.c', 'e1000_phy.c',
'e1000_vf.c' 'e1000_vf.c',
] ]
error_cflags = ['-Wno-uninitialized', '-Wno-unused-parameter', error_cflags = ['-Wno-uninitialized', '-Wno-unused-parameter',

View File

@ -7,7 +7,7 @@ sources = [
'fm10k_mbx.c', 'fm10k_mbx.c',
'fm10k_pf.c', 'fm10k_pf.c',
'fm10k_tlv.c', 'fm10k_tlv.c',
'fm10k_vf.c' 'fm10k_vf.c',
] ]
error_cflags = ['-Wno-unused-parameter', '-Wno-unused-value', error_cflags = ['-Wno-unused-parameter', '-Wno-unused-value',

View File

@ -8,7 +8,7 @@ sources = [
'i40e_diag.c', 'i40e_diag.c',
'i40e_hmc.c', 'i40e_hmc.c',
'i40e_lan_hmc.c', 'i40e_lan_hmc.c',
'i40e_nvm.c' 'i40e_nvm.c',
] ]
error_cflags = ['-Wno-sign-compare', '-Wno-unused-value', error_cflags = ['-Wno-sign-compare', '-Wno-unused-value',

View File

@ -14,7 +14,7 @@ sources = [
'ixgbe_phy.c', 'ixgbe_phy.c',
'ixgbe_vf.c', 'ixgbe_vf.c',
'ixgbe_x540.c', 'ixgbe_x540.c',
'ixgbe_x550.c' 'ixgbe_x550.c',
] ]
error_cflags = ['-Wno-unused-value', error_cflags = ['-Wno-unused-value',

View File

@ -4,7 +4,7 @@
sources = [ sources = [
'octeontx_pkovf.c', 'octeontx_pkovf.c',
'octeontx_pkivf.c', 'octeontx_pkivf.c',
'octeontx_bgx.c' 'octeontx_bgx.c',
] ]
depends = ['ethdev', 'mempool_octeontx'] depends = ['ethdev', 'mempool_octeontx']

View File

@ -24,13 +24,13 @@ extra_flags += '-Wno-strict-aliasing'
# Enable more warnings # Enable more warnings
extra_flags += [ extra_flags += [
'-Wdisabled-optimization' '-Wdisabled-optimization',
] ]
# Compiler and version dependent flags # Compiler and version dependent flags
extra_flags += [ extra_flags += [
'-Waggregate-return', '-Waggregate-return',
'-Wbad-function-cast' '-Wbad-function-cast',
] ]
foreach flag: extra_flags foreach flag: extra_flags

View File

@ -4,7 +4,7 @@
sources = [ sources = [
'nicvf_hw.c', 'nicvf_hw.c',
'nicvf_mbox.c', 'nicvf_mbox.c',
'nicvf_bsvf.c' 'nicvf_bsvf.c',
] ]
c_args = cflags c_args = cflags

View File

@ -10,5 +10,5 @@ includes += include_directories('../shared')
allow_experimental_apis = true allow_experimental_apis = true
sources = files( sources = files(
'client.c' 'client.c',
) )

View File

@ -10,5 +10,7 @@ includes += include_directories('../shared')
allow_experimental_apis = true allow_experimental_apis = true
sources = files( sources = files(
'args.c', 'init.c', 'main.c' 'args.c',
'init.c',
'main.c',
) )

View File

@ -8,5 +8,6 @@
allow_experimental_apis = true allow_experimental_apis = true
sources = files( sources = files(
'commands.c', 'main.c' 'commands.c',
'main.c',
) )

View File

@ -8,5 +8,6 @@
allow_experimental_apis = true allow_experimental_apis = true
sources = files( sources = files(
'mp_commands.c', 'main.c' 'mp_commands.c',
'main.c',
) )

View File

@ -8,5 +8,5 @@
allow_experimental_apis = true allow_experimental_apis = true
sources = files( sources = files(
'main.c' 'main.c',
) )

View File

@ -12,6 +12,6 @@ headers = files(
'rte_mbuf_core.h', 'rte_mbuf_core.h',
'rte_mbuf_ptype.h', 'rte_mbuf_ptype.h',
'rte_mbuf_pool_ops.h', 'rte_mbuf_pool_ops.h',
'rte_mbuf_dyn.h' 'rte_mbuf_dyn.h',
) )
deps += ['mempool'] deps += ['mempool']

View File

@ -19,6 +19,6 @@ headers = files(
'rte_power.h', 'rte_power.h',
'rte_power_empty_poll.h', 'rte_power_empty_poll.h',
'rte_power_pmd_mgmt.h', 'rte_power_pmd_mgmt.h',
'rte_power_guest_channel.h' 'rte_power_guest_channel.h',
) )
deps += ['timer', 'ethdev'] deps += ['timer', 'ethdev']

View File

@ -36,5 +36,5 @@ deps += ['mbuf', 'port', 'lpm', 'hash', 'acl']
indirect_headers += files( indirect_headers += files(
'rte_lru_arm64.h', 'rte_lru_arm64.h',
'rte_lru_x86.h', 'rte_lru_x86.h',
'rte_table_hash_func_arm64.h' 'rte_table_hash_func_arm64.h',
) )