[RFC,06/14] build: reduce indentation in app build spec
Checks
Commit Message
As with the lib and drivers directories, we can use "continue" keyword to
reduce the indentation level of the majority of the foreach block. At the
same time, we can also replace tab indentation with spaces.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
app/meson.build | 100 ++++++++++++++++++++++++------------------------
1 file changed, 50 insertions(+), 50 deletions(-)
Comments
01/04/2021 13:50, Bruce Richardson:
> As with the lib and drivers directories, we can use "continue" keyword to
> reduce the indentation level of the majority of the foreach block. At the
> same time, we can also replace tab indentation with spaces.
>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> + 'pdump',
> + 'proc-info',
> + 'test-acl',
> + 'test-bbdev',
> + 'test-cmdline',
> + 'test-compress-perf',
> + 'test-crypto-perf',
> + 'test-eventdev',
> + 'test-fib',
> + 'test-flow-perf',
> + 'test-pipeline',
> + 'test-pmd',
> + 'test-regex',
> + 'test-sad']
Can we have an extra comma like this?
'test-sad',
]
On Thu, Apr 01, 2021 at 03:32:14PM +0200, Thomas Monjalon wrote:
> 01/04/2021 13:50, Bruce Richardson:
> > As with the lib and drivers directories, we can use "continue" keyword to
> > reduce the indentation level of the majority of the foreach block. At the
> > same time, we can also replace tab indentation with spaces.
> >
> > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> > ---
> > + 'pdump',
> > + 'proc-info',
> > + 'test-acl',
> > + 'test-bbdev',
> > + 'test-cmdline',
> > + 'test-compress-perf',
> > + 'test-crypto-perf',
> > + 'test-eventdev',
> > + 'test-fib',
> > + 'test-flow-perf',
> > + 'test-pipeline',
> > + 'test-pmd',
> > + 'test-regex',
> > + 'test-sad']
>
> Can we have an extra comma like this?
>
> 'test-sad',
> ]
>
Not sure about changes of that magnitude. :-)
Will try and standardize on that on all lists for a V2.
@@ -2,71 +2,71 @@
# Copyright(c) 2017-2019 Intel Corporation
if is_windows
- subdir_done()
+ subdir_done()
endif
apps = [
- 'pdump',
- 'proc-info',
- 'test-acl',
- 'test-bbdev',
- 'test-cmdline',
- 'test-compress-perf',
- 'test-crypto-perf',
- 'test-eventdev',
- 'test-fib',
- 'test-flow-perf',
- 'test-pipeline',
- 'test-pmd',
- 'test-regex',
- 'test-sad']
+ 'pdump',
+ 'proc-info',
+ 'test-acl',
+ 'test-bbdev',
+ 'test-cmdline',
+ 'test-compress-perf',
+ 'test-crypto-perf',
+ 'test-eventdev',
+ 'test-fib',
+ 'test-flow-perf',
+ 'test-pipeline',
+ 'test-pmd',
+ 'test-regex',
+ 'test-sad']
default_cflags = machine_args + ['-DALLOW_EXPERIMENTAL_API']
default_ldflags = []
if get_option('default_library') == 'static' and not is_windows
- default_ldflags += ['-Wl,--export-dynamic']
+ default_ldflags += ['-Wl,--export-dynamic']
endif
foreach app:apps
- build = true
- name = app
- sources = []
- includes = []
- cflags = default_cflags
- ldflags = default_ldflags
- objs = [] # other object files to link against, used e.g. for
- # instruction-set optimized versions of code
+ build = true
+ name = app
+ sources = []
+ includes = []
+ cflags = default_cflags
+ ldflags = default_ldflags
+ objs = [] # other object files to link against, used e.g. for
+ # instruction-set optimized versions of code
- # use "deps" for internal DPDK dependencies, and "ext_deps" for
- # external package/library requirements
- ext_deps = []
- deps = []
+ # use "deps" for internal DPDK dependencies, and "ext_deps" for
+ # external package/library requirements
+ ext_deps = []
+ deps = []
- subdir(name)
+ subdir(name)
- if build
- dep_objs = []
- foreach d:deps
- dep_objs += get_variable(get_option('default_library')
- + '_rte_' + d)
- endforeach
+ if not build
+ continue
+ endif
- link_libs = []
- if get_option('default_library') == 'static'
- link_libs = dpdk_static_libraries + dpdk_drivers
- endif
+ dep_objs = []
+ foreach d:deps
+ dep_objs += get_variable(get_option('default_library') + '_rte_' + d)
+ endforeach
- executable('dpdk-' + name,
- sources,
- c_args: cflags,
- link_args: ldflags,
- link_whole: link_libs,
- dependencies: dep_objs,
- include_directories: includes,
- install_rpath: join_paths(get_option('prefix'),
- driver_install_path),
- install: true)
- endif
+ link_libs = []
+ if get_option('default_library') == 'static'
+ link_libs = dpdk_static_libraries + dpdk_drivers
+ endif
+
+ executable('dpdk-' + name,
+ sources,
+ c_args: cflags,
+ link_args: ldflags,
+ link_whole: link_libs,
+ dependencies: dep_objs,
+ include_directories: includes,
+ install_rpath: join_paths(get_option('prefix'), driver_install_path),
+ install: true)
endforeach
# special case the autotests