build: add single source of DPDK version number

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 <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
Reviewed-by: Rami Rosen <ramirose@gmail.com>

diff --git a/VERSION b/VERSION
new file mode 100644 (file)
index 0000000..c4a4cd0
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+19.05.0-rc0

diff --git a/meson.build b/meson.build
index e945a27c373fb00de480df4bdf0530e7085910fe..0dd0e2d712f3a18288625c566d952456bb8fe1f9 100644 (file)
--- 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 c79bec1795d9e25d003ebbbd2c7e5b466a83cc0a..46ec9e76df9080a9b5ba1c56417552f7e1202dd4 100644 (file)
--- 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 %~,\