DPDK patches and discussions
 help / color / mirror / Atom feed
From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-dev] [PATCH 2/4] build: use version number from config file
Date: Thu,  7 Mar 2019 11:54:46 +0000	[thread overview]
Message-ID: <20190307115448.54041-3-bruce.richardson@intel.com> (raw)
In-Reply-To: <20190307115448.54041-1-bruce.richardson@intel.com>

Since we have the version number in a separate file at the root level,
we should not need to duplicate this in rte_version.h too. Best
approach here is to move the macros for specifying the year/month/etc.
parts from the version header file to the build config file - leaving
the other utility macros for e.g. printing the version string, where they
are.

For make this is done by having a little bit of awk parse the version
file and pass the results through to the preprocessor for the config
generation stage.

For meson, this is done by parsing the version and adding it to the
standard dpdk_conf object.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 DPDK_VERSION                                |  2 +-
 config/common_base                          | 14 +++++++++
 config/rte_config.h                         |  5 ++++
 lib/librte_eal/common/include/rte_version.h | 32 ---------------------
 meson.build                                 | 14 +++++++++
 mk/rte.sdkconfig.mk                         |  2 ++
 6 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/DPDK_VERSION b/DPDK_VERSION
index c4a4cd00b..e013b54dd 100644
--- a/DPDK_VERSION
+++ b/DPDK_VERSION
@@ -1 +1 @@
-19.05.0-rc0
+19.05.1
diff --git a/config/common_base b/config/common_base
index 0b09a9348..6292bc4af 100644
--- a/config/common_base
+++ b/config/common_base
@@ -1,6 +1,20 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2010-2017 Intel Corporation
 
+#
+# String that appears before the version number
+#
+CONFIG_RTE_VER_PREFIX="DPDK"
+
+#
+# Version information completed when this file is processed for a build
+#
+CONFIG_RTE_VER_YEAR=__YEAR
+CONFIG_RTE_VER_MONTH=__MONTH
+CONFIG_RTE_VER_MINOR=__MINOR
+CONFIG_RTE_VER_SUFFIX=__SUFFIX
+CONFIG_RTE_VER_RELEASE=__RELEASE
+
 #
 # define executive environment
 # RTE_EXEC_ENV values are the directories in mk/exec-env/
diff --git a/config/rte_config.h b/config/rte_config.h
index 7606f5d7b..5f1749dbb 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -18,6 +18,11 @@
 
 #include <rte_build_config.h>
 
+/**
+ * String that appears before the version number
+ */
+#define RTE_VER_PREFIX "DPDK"
+
 /****** library defines ********/
 
 /* compat defines */
diff --git a/lib/librte_eal/common/include/rte_version.h b/lib/librte_eal/common/include/rte_version.h
index a7eed7ab7..50867ea81 100644
--- a/lib/librte_eal/common/include/rte_version.h
+++ b/lib/librte_eal/common/include/rte_version.h
@@ -19,38 +19,6 @@ extern "C" {
 #include <stdio.h>
 #include <rte_common.h>
 
-/**
- * String that appears before the version number
- */
-#define RTE_VER_PREFIX "DPDK"
-
-/**
- * Major version/year number i.e. the yy in yy.mm.z
- */
-#define RTE_VER_YEAR 19
-
-/**
- * Minor version/month number i.e. the mm in yy.mm.z
- */
-#define RTE_VER_MONTH 5
-
-/**
- * Patch level number i.e. the z in yy.mm.z
- */
-#define RTE_VER_MINOR 0
-
-/**
- * Extra string to be appended to version number
- */
-#define RTE_VER_SUFFIX "-rc"
-
-/**
- * Patch release number
- *   0-15 = release candidates
- *   16   = release
- */
-#define RTE_VER_RELEASE 0
-
 /**
  * Macro to compute a version number usable for comparisons
  */
diff --git a/meson.build b/meson.build
index 757618144..9d5320395 100644
--- a/meson.build
+++ b/meson.build
@@ -22,6 +22,20 @@ dpdk_app_link_libraries = []
 pver = meson.project_version().split('.')
 major_version = '@0@.@1@'.format(pver.get(0), pver.get(1))
 
+# extract all version information into the build configuration
+dpdk_conf.set('RTE_VER_YEAR', pver.get(0))
+dpdk_conf.set('RTE_VER_MONTH', pver.get(1))
+if pver.get(2).contains('-rc')
+	rc_ver = pver.get(2).split('-rc')
+	dpdk_conf.set('RTE_VER_MINOR', rc_ver.get(0))
+	dpdk_conf.set_quoted('RTE_VER_SUFFIX', '-rc')
+	dpdk_conf.set('RTE_VER_RELEASE', rc_ver.get(1))
+else
+	dpdk_conf.set('RTE_VER_MINOR', pver.get(2))
+	dpdk_conf.set_quoted('RTE_VER_SUFFIX', '')
+	dpdk_conf.set('RTE_VER_RELEASE', 0)
+endif
+
 pmd_subdir_opt = get_option('drivers_install_subdir')
 if pmd_subdir_opt.contains('<VERSION>')
 	pmd_subdir_opt = major_version.join(pmd_subdir_opt.split('<VERSION>'))
diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk
index 8dc31d7cf..bbfa24dee 100644
--- a/mk/rte.sdkconfig.mk
+++ b/mk/rte.sdkconfig.mk
@@ -76,6 +76,8 @@ else
 $(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE | $(RTE_OUTPUT)
 	$(Q)if [ "$(RTE_CONFIG_TEMPLATE)" != "" -a -f "$(RTE_CONFIG_TEMPLATE)" ]; then \
 		$(CPP) -undef -P -x assembler-with-cpp \
+		`cat $(RTE_SRCDIR)/DPDK_VERSION | sed -e 's/-rc/.-rc./' | \
+		awk -F '.' '{print "-D__YEAR="$$1, "-D__MONTH="$$2, "-D__MINOR="$$3, "-D__SUFFIX=\""$$4"\"", "-D__RELEASE="int($$5)}'` \
 		-ffreestanding \
 		-o $(RTE_OUTPUT)/.config_tmp $(RTE_CONFIG_TEMPLATE) ; \
 		config=$$(cat $(RTE_OUTPUT)/.config_tmp) ; \
-- 
2.20.1

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

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-07 11:54 [dpdk-dev] [RFC PATCH 0/4] One versionfile to rule them all Bruce Richardson
2019-03-07 11:54 ` [dpdk-dev] [PATCH 1/4] build: add single source of DPDK version number Bruce Richardson
2019-03-07 12:33   ` David Marchand
2019-03-07 11:54 ` Bruce Richardson [this message]
2019-03-07 12:37   ` [dpdk-dev] [PATCH 2/4] build: use version number from config file 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 ` [dpdk-dev] [PATCH 3/4] build: move meson version handling to config directory Bruce Richardson
2019-03-07 11:54 ` [dpdk-dev] [PATCH 4/4] eal: remove unneeded version logic Bruce Richardson
2019-03-07 12:09 ` [dpdk-dev] [RFC PATCH 0/4] One versionfile to rule them all Luca Boccassi
2019-03-07 12:14   ` Bruce Richardson
2019-03-07 13:34 ` [dpdk-dev] [PATCH v2 " Bruce Richardson
2019-03-07 13:34   ` [dpdk-dev] [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   ` [dpdk-dev] [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   ` [dpdk-dev] [PATCH v2 3/4] build: move meson version handling to config directory Bruce Richardson
2019-03-07 13:35   ` [dpdk-dev] [PATCH v2 4/4] eal: remove unneeded version logic Bruce Richardson
2019-03-15 18:20 ` [dpdk-dev] [PATCH v3 0/4] One versionfile to rule them all Bruce Richardson
2019-03-15 18:20   ` Bruce Richardson
2019-03-15 18:20   ` [dpdk-dev] [PATCH v3 1/4] build: add single source of DPDK version number Bruce Richardson
2019-03-15 18:20     ` Bruce Richardson
2019-03-16 18:01     ` Rami Rosen
2019-03-16 18:01       ` Rami Rosen
2019-03-15 18:20   ` [dpdk-dev] [PATCH v3 2/4] build: move meson version handling to config directory Bruce Richardson
2019-03-15 18:20     ` Bruce Richardson
2019-03-15 18:20   ` [dpdk-dev] [PATCH v3 3/4] build: use version number from config file Bruce Richardson
2019-03-15 18:20     ` Bruce Richardson
2019-03-27  0:27     ` Thomas Monjalon
2019-03-27  0:27       ` Thomas Monjalon
2019-03-15 18:20   ` [dpdk-dev] [PATCH v3 4/4] eal: remove unneeded version logic Bruce Richardson
2019-03-15 18:20     ` Bruce Richardson
2019-03-27  0:34   ` [dpdk-dev] [PATCH v3 0/4] One versionfile to rule them all Thomas Monjalon
2019-03-27  0:34     ` 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-3-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).