From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <bruce.richardson@intel.com>
Received: from mga18.intel.com (mga18.intel.com [134.134.136.126])
by dpdk.org (Postfix) with ESMTP id 2A6FB4C9C
for <dev@dpdk.org>; Thu, 7 Mar 2019 12:55:01 +0100 (CET)
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga002.jf.intel.com ([10.7.209.21])
by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
07 Mar 2019 03:55:00 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.58,451,1544515200"; d="scan'208";a="139925565"
Received: from silpixa00399126.ir.intel.com (HELO
silpixa00399126.ger.corp.intel.com) ([10.237.222.236])
by orsmga002.jf.intel.com with ESMTP; 07 Mar 2019 03:55:00 -0800
From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>
Date: Thu, 7 Mar 2019 11:54:45 +0000
Message-Id: <20190307115448.54041-2-bruce.richardson@intel.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20190307115448.54041-1-bruce.richardson@intel.com>
References: <20190307115448.54041-1-bruce.richardson@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH 1/4] build: add single source of DPDK version
number
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>
X-List-Received-Date: Thu, 07 Mar 2019 11:55:01 -0000
Add a new file DPDK_VERSION to hold the current DPDK version number.
Have meson use this file for it's project version, and have make use
it for reporting out "showversion" and "showversionum".
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
DPDK_VERSION | 1 +
meson.build | 2 +-
mk/rte.sdkconfig.mk | 16 ++--------------
3 files changed, 4 insertions(+), 15 deletions(-)
create mode 100644 DPDK_VERSION
diff --git a/DPDK_VERSION b/DPDK_VERSION
new file mode 100644
index 000000000..c4a4cd00b
--- /dev/null
+++ b/DPDK_VERSION
@@ -0,0 +1 @@
+19.05.0-rc0
diff --git a/meson.build b/meson.build
index 69833de82..757618144 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,9 @@
# Copyright(c) 2017 Intel Corporation
project('DPDK', 'C',
- version: '19.05.0-rc0',
+ # get version number from file
+ # use "more" rather than "cat" for windows compatiblity
+ version: run_command('more', files('DPDK_VERSION')).stdout().strip(),
license: 'BSD',
default_options: ['buildtype=release', 'default_library=static'],
meson_version: '>= 0.47.1'
diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk
index fa77331cb..8dc31d7cf 100644
--- a/mk/rte.sdkconfig.mk
+++ b/mk/rte.sdkconfig.mk
@@ -3,23 +3,11 @@
.PHONY: showversion
showversion:
- @set -- \
- $$(sed -rne 's,^#define RTE_VER_[A-Z_]*[[:space:]]+([0-9]+).*,\1,p' \
- -e 's,^#define RTE_VER_SUFFIX[[:space:]]+"(.*)",\1,p' \
- $(RTE_SRCDIR)/lib/librte_eal/common/include/rte_version.h) ;\
- printf '%d.%02d.%d' "$$1" "$$2" "$$3"; \
- if [ -z "$$5" ]; then echo; \
- else printf '%s' "$$4"; \
- if [ $$5 -lt 16 ] ; then echo $$5; \
- else echo $$(($$5 - 16)); fi; \
- fi
+ @cat $(RTE_SRCDIR)/DPDK_VERSION
.PHONY: showversionum
showversionum:
- @set -- \
- $$(sed -rne 's,^#define RTE_VER_[A-Z_]*[[:space:]]+([0-9]+).*,\1,p' \
- $(RTE_SRCDIR)/lib/librte_eal/common/include/rte_version.h); \
- printf '%02d%02d\n' "$$1" "$$2"
+ @cat ${RTE_SRCDIR}/DPDK_VERSION | awk -F '.' '{print $$1$$2}'
INSTALL_CONFIGS := $(sort $(filter-out %~,\
$(patsubst $(RTE_SRCDIR)/config/defconfig_%,%,\
--
2.20.1