All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>
Subject: [PATCH 1/4] build: add single source of DPDK version number
Date: Thu,  7 Mar 2019 11:54:45 +0000	[thread overview]
Message-ID: <20190307115448.54041-2-bruce.richardson@intel.com> (raw)
In-Reply-To: <20190307115448.54041-1-bruce.richardson@intel.com>

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

  reply	other threads:[~2019-03-07 11:55 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-07 11:54 [RFC PATCH 0/4] One versionfile to rule them all Bruce Richardson
2019-03-07 11:54 ` Bruce Richardson [this message]
2019-03-07 12:33   ` [PATCH 1/4] build: add single source of DPDK version number David Marchand
2019-03-07 11:54 ` [PATCH 2/4] build: use version number from config file Bruce Richardson
2019-03-07 12:37   ` David Marchand
2019-03-07 12:42     ` David Marchand
2019-03-07 13:12       ` Bruce Richardson
2019-03-07 13:01     ` Bruce Richardson
2019-03-07 11:54 ` [PATCH 3/4] build: move meson version handling to config directory Bruce Richardson
2019-03-07 11:54 ` [PATCH 4/4] eal: remove unneeded version logic Bruce Richardson
2019-03-07 12:09 ` [RFC PATCH 0/4] One versionfile to rule them all Luca Boccassi
2019-03-07 12:14   ` Bruce Richardson
2019-03-07 13:34 ` [PATCH v2 " Bruce Richardson
2019-03-07 13:34   ` [PATCH v2 1/4] build: add single source of DPDK version number Bruce Richardson
2019-03-13 11:06     ` Thomas Monjalon
2019-03-13 11:17       ` Bruce Richardson
2019-03-13 11:23         ` Thomas Monjalon
2019-03-13 11:27           ` Bruce Richardson
2019-03-07 13:35   ` [PATCH v2 2/4] build: use version number from config file Bruce Richardson
2019-03-13 11:13     ` Thomas Monjalon
2019-03-13 11:20       ` Bruce Richardson
2019-03-13 11:24         ` Thomas Monjalon
2019-03-07 13:35   ` [PATCH v2 3/4] build: move meson version handling to config directory Bruce Richardson
2019-03-07 13:35   ` [PATCH v2 4/4] eal: remove unneeded version logic Bruce Richardson
2019-03-15 18:20 ` [PATCH v3 0/4] One versionfile to rule them all Bruce Richardson
2019-03-15 18:20   ` [PATCH v3 1/4] build: add single source of DPDK version number Bruce Richardson
2019-03-16 18:01     ` Rami Rosen
2019-03-15 18:20   ` [PATCH v3 2/4] build: move meson version handling to config directory Bruce Richardson
2019-03-15 18:20   ` [PATCH v3 3/4] build: use version number from config file Bruce Richardson
2019-03-27  0:27     ` Thomas Monjalon
2019-03-15 18:20   ` [PATCH v3 4/4] eal: remove unneeded version logic Bruce Richardson
2019-03-27  0:34   ` [PATCH v3 0/4] One versionfile to rule them all Thomas Monjalon

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=20190307115448.54041-2-bruce.richardson@intel.com \
    --to=bruce.richardson@intel.com \
    --cc=dev@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.