From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id B54B62C17 for ; Fri, 15 Mar 2019 19:20:40 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Mar 2019 11:20:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,483,1544515200"; d="scan'208";a="134701241" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.222.236]) by fmsmga007.fm.intel.com with ESMTP; 15 Mar 2019 11:20:39 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: David Marchand , Thomas Monjalon , Luca Boccassi , Bruce Richardson Date: Fri, 15 Mar 2019 18:20:19 +0000 Message-Id: <20190315182022.39976-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190315182022.39976-1-bruce.richardson@intel.com> References: <20190307115448.54041-1-bruce.richardson@intel.com> <20190315182022.39976-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v3 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: , X-List-Received-Date: Fri, 15 Mar 2019 18:20:41 -0000 Add a new file 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 --- v3: rename file from DPDK_VERSION to VERSION v2: fix typos and include Luca's ack. --- VERSION | 1 + meson.build | 4 +++- mk/rte.sdkconfig.mk | 16 ++-------------- 3 files changed, 6 insertions(+), 15 deletions(-) create mode 100644 VERSION diff --git a/VERSION b/VERSION new file mode 100644 index 000000000..c4a4cd00b --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +19.05.0-rc0 diff --git a/meson.build b/meson.build index 69833de82..1b31e0da5 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('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 c79bec179..46ec9e76d 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)/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)/VERSION | awk -F '.' '{print $$1$$2}' INSTALL_CONFIGS := $(sort $(filter-out %app-icc,$(filter-out %app-clang,\ $(filter-out %app-gcc,$(filter-out %~,\ -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id BCA9FA0096 for ; Fri, 15 Mar 2019 19:20:47 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0BA0C4CBD; Fri, 15 Mar 2019 19:20:43 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id B54B62C17 for ; Fri, 15 Mar 2019 19:20:40 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Mar 2019 11:20:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,483,1544515200"; d="scan'208";a="134701241" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.222.236]) by fmsmga007.fm.intel.com with ESMTP; 15 Mar 2019 11:20:39 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: David Marchand , Thomas Monjalon , Luca Boccassi , Bruce Richardson Date: Fri, 15 Mar 2019 18:20:19 +0000 Message-Id: <20190315182022.39976-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190315182022.39976-1-bruce.richardson@intel.com> References: <20190307115448.54041-1-bruce.richardson@intel.com> <20190315182022.39976-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v3 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" Content-Type: text/plain; charset="UTF-8" Message-ID: <20190315182019.u5C23mRmME-FHi3_RJCz7CaVBtv2rNMJTUDw6AYkAVs@z> Add a new file 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 --- v3: rename file from DPDK_VERSION to VERSION v2: fix typos and include Luca's ack. --- VERSION | 1 + meson.build | 4 +++- mk/rte.sdkconfig.mk | 16 ++-------------- 3 files changed, 6 insertions(+), 15 deletions(-) create mode 100644 VERSION diff --git a/VERSION b/VERSION new file mode 100644 index 000000000..c4a4cd00b --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +19.05.0-rc0 diff --git a/meson.build b/meson.build index 69833de82..1b31e0da5 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('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 c79bec179..46ec9e76d 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)/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)/VERSION | awk -F '.' '{print $$1$$2}' INSTALL_CONFIGS := $(sort $(filter-out %app-icc,$(filter-out %app-clang,\ $(filter-out %app-gcc,$(filter-out %~,\ -- 2.20.1