summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorBruce Richardson <bruce.richardson@intel.com>2019-03-15 18:20:21 +0000
committerThomas Monjalon <thomas@monjalon.net>2019-03-27 09:43:47 +0100
commitd320fe56bd51bbc087bb1c7e0cf1ffdec004185b (patch)
treef3e7de33682236b65e5b73afe26ed5e4bd1c7d42 /config
parent664c59fac1e68f9a59634690776c36a4e5891a8a (diff)
downloaddpdk-next-eventdev-d320fe56bd51bbc087bb1c7e0cf1ffdec004185b.zip
dpdk-next-eventdev-d320fe56bd51bbc087bb1c7e0cf1ffdec004185b.tar.gz
dpdk-next-eventdev-d320fe56bd51bbc087bb1c7e0cf1ffdec004185b.tar.xz
build: use version number from config file
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. In both cases, we need to append a large number - in this case "99", previously 16 in original code - to the version number when we want to do version number comparisons. Without this, the release version e.g. 19.05.0 will compare as less than it's RC's e.g. 19.05.0-rc4. With it, the comparison is correct as "19.05.0.99 > 19.05.0-rc4.99". Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> Acked-by: Luca Boccassi <bluca@debian.org> Acked-by: Thomas Monjalon <thomas@monjalon.net>
Diffstat (limited to 'config')
-rw-r--r--config/common_base14
-rw-r--r--config/meson.build16
-rw-r--r--config/rte_config.h3
3 files changed, 33 insertions, 0 deletions
diff --git a/config/common_base b/config/common_base
index 0b09a93..6292bc4 100644
--- a/config/common_base
+++ b/config/common_base
@@ -2,6 +2,20 @@
# 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/meson.build b/config/meson.build
index 999dea9..30a7261 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -6,6 +6,22 @@
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).to_int())
+dpdk_conf.set('RTE_VER_MONTH', pver.get(1).to_int())
+if pver.get(2).contains('-rc')
+ rc_ver = pver.get(2).split('-rc')
+ dpdk_conf.set('RTE_VER_MINOR', rc_ver.get(0).to_int())
+ dpdk_conf.set_quoted('RTE_VER_SUFFIX', '-rc')
+ dpdk_conf.set('RTE_VER_RELEASE', rc_ver.get(1).to_int())
+else
+ dpdk_conf.set('RTE_VER_MINOR', pver.get(2).to_int())
+ dpdk_conf.set_quoted('RTE_VER_SUFFIX', '')
+# for actual, non-rc releases, set the release value to 99 to ensure releases
+# have higher version numbers than their respective release candidates
+ dpdk_conf.set('RTE_VER_RELEASE', 99)
+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/config/rte_config.h b/config/rte_config.h
index 1690f4d..cda51af 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -26,6 +26,9 @@
#define RTE_EXEC_ENV_BSDAPP 1
#endif
+/* String that appears before the version number */
+#define RTE_VER_PREFIX "DPDK"
+
/****** library defines ********/
/* compat defines */