From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: bluca@debian.org, Bruce Richardson <bruce.richardson@intel.com>,
stable@dpdk.org
Subject: [dpdk-stable] [PATCH v3 2/3] examples: remove auto-generation of examples list
Date: Fri, 17 May 2019 13:02:30 +0100 [thread overview]
Message-ID: <20190517120231.15898-3-bruce.richardson@intel.com> (raw)
In-Reply-To: <20190517120231.15898-1-bruce.richardson@intel.com>
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: 2daf565f91b5 ("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>
---
examples/meson.build | 31 ++++++++++++++++++++++++++++---
1 file changed, 28 insertions(+), 3 deletions(-)
diff --git a/examples/meson.build b/examples/meson.build
index 1995f4dcb..de35656d4 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -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
--
2.21.0
next prev parent reply other threads:[~2019-05-17 12:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190503133537.58712-1-bruce.richardson@intel.com>
[not found] ` <20190517114613.7027-1-bruce.richardson@intel.com>
2019-05-17 11:46 ` [dpdk-stable] [PATCH v2 1/3] examples: fix install of sample apps if setting not provided Bruce Richardson
2019-05-17 11:54 ` Bruce Richardson
2019-05-17 11:46 ` [dpdk-stable] [PATCH v2 2/3] examples: remove auto-generation of examples list Bruce Richardson
2019-05-17 11:46 ` [dpdk-stable] [PATCH v2 3/3] examples: fix make clean when using pkg-config for building Bruce Richardson
[not found] ` <20190517120231.15898-1-bruce.richardson@intel.com>
2019-05-17 12:02 ` [dpdk-stable] [PATCH v3 1/3] examples: fix install of sample apps if setting not provided Bruce Richardson
2019-05-17 12:02 ` Bruce Richardson [this message]
2019-05-17 12:02 ` [dpdk-stable] [PATCH v3 3/3] examples: fix make clean when using pkg-config for building Bruce Richardson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190517120231.15898-3-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=bluca@debian.org \
--cc=dev@dpdk.org \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).