From patchwork Thu Mar 7 13:34:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 50962 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 709DFD0B2; Thu, 7 Mar 2019 14:35:23 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id C39D17CEB for ; Thu, 7 Mar 2019 14:35:21 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Mar 2019 05:35:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,451,1544515200"; d="scan'208";a="325085856" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.222.236]) by fmsmga006.fm.intel.com with ESMTP; 07 Mar 2019 05:35:20 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: David Marchand , Bruce Richardson , Luca Boccassi Date: Thu, 7 Mar 2019 13:34:59 +0000 Message-Id: <20190307133502.55321-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190307133502.55321-1-bruce.richardson@intel.com> References: <20190307115448.54041-1-bruce.richardson@intel.com> <20190307133502.55321-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 Acked-by: Luca Boccassi --- v2: fix typos and include Luca's ack. --- DPDK_VERSION | 1 + meson.build | 4 +++- mk/rte.sdkconfig.mk | 16 ++-------------- 3 files changed, 6 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..aaa6002ae 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 compatibility + 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..d9c8d53d2 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_%,%,\