From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by dpdk.space (Postfix) with ESMTP id 56324A00E6
for <public@inbox.dpdk.org>; Fri, 17 May 2019 13:47:14 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 908E65F1D;
Fri, 17 May 2019 13:47:01 +0200 (CEST)
Received: from mga12.intel.com (mga12.intel.com [192.55.52.136])
by dpdk.org (Postfix) with ESMTP id DE4665F14;
Fri, 17 May 2019 13:46:56 +0200 (CEST)
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga001.jf.intel.com ([10.7.209.18])
by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
17 May 2019 04:46:56 -0700
X-ExtLoop1: 1
Received: from silpixa00399126.ir.intel.com (HELO
silpixa00399126.ger.corp.intel.com) ([10.237.223.2])
by orsmga001.jf.intel.com with ESMTP; 17 May 2019 04:46:55 -0700
From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: bluca@debian.org, Bruce Richardson <bruce.richardson@intel.com>,
stable@dpdk.org
Date: Fri, 17 May 2019 12:46:12 +0100
Message-Id: <20190517114613.7027-3-bruce.richardson@intel.com>
X-Mailer: git-send-email 2.21.0
In-Reply-To: <20190517114613.7027-1-bruce.richardson@intel.com>
References: <20190503133537.58712-1-bruce.richardson@intel.com>
<20190517114613.7027-1-bruce.richardson@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v2 2/3] examples: remove auto-generation of
examples list
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
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 1a6134f12..8b6577cf7 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