d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

examples: remove auto-generation of examples list

Browse Source 
The examples/meson.build file scanned the filesystem to find all examples
to build (for examples=all option) and install. However, using run_command
and scanning the filesystem prevented ninja from properly detecting the
addition or removal of any examples - one had to recreate the build
directory from scratch to guarantee correct detection of all examples. This
patch replaces this generated list with a static list of examples, thereby
allowing proper tracking by ninja/meson, but at the cost of having to
update this file when a new example is added or removed.

This also fixes an issue with Windows builds, since "sh" is not available
there.

Fixes: 2daf565f91 ("examples: install as part of ninja install")
Cc: stable@dpdk.org

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
This commit is contained in:
Bruce Richardson 2019-05-17 13:02:30 +01:00 committed by Thomas Monjalon
parent 85d7158edf
commit 699729bea9
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
examples/meson.build
View File

@ -8,9 +8,34 @@ endif
execinfo = cc.find_library('execinfo', required: false)
all_examples = run_command('sh', '-c',
'cd $MESON_SOURCE_ROOT/$MESON_SUBDIR && for d in * ; do if [ -d $d ] ; then echo $d ; fi ; done'
).stdout().split()
# list of all example apps. Keep 1-3 per line, in alphabetical order.
all_examples = [
'bbdev_app', 'bond',
'bpf', 'cmdline',
'distributor', 'ethtool',
'eventdev_pipeline', 'exception_path',
'fips_validation', 'flow_classify',
'flow_filtering', 'helloworld',
'ip_fragmentation', 'ip_pipeline',
'ip_reassembly', 'ipsec-secgw',
'ipv4_multicast', 'kni',
'l2fwd', 'l2fwd-cat',
'l2fwd-crypto', 'l2fwd-jobstats',
'l2fwd-keepalive', 'l3fwd',
'l3fwd-acl', 'l3fwd-power',
'l3fwd-vf', 'link_status_interrupt',
'load_balancer', 'multi_process',
'netmap_compat', 'packet_ordering',
'performance-thread', 'ptpclient',
'qos_meter', 'qos_sched',
'quota_watermark', 'rxtx_callbacks',
'server_node_efd', 'service_cores',
'skeleton', 'tep_termination',
'timer', 'vdpa',
'vhost', 'vhost_crypto',
'vhost_scsi', 'vm_power_manager',
'vmdq', 'vmdq_dcb',
]
# install all example code on install - irrespective of whether the example in
# question is to be built as part of this build or not.
foreach ex:all_examples