aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2017-01-03 19:56:43 +0100
committerJohn Lo <loj@cisco.com>2017-01-03 20:32:06 +0000
commit99c201964ab7514e55d66ad2ca5bbe68440bd75b (patch)
treeba2296192f3966a454f76b494ea1f4e8598968ed
parent5ac9bf53b3360f7987ee31ab7377d801e6c713db (diff)
fix version.h generation for out-of-tree builds
Change-Id: Ic882f5aec74858a36533ed8cd61a7726947dceef Signed-off-by: Damjan Marion <damarion@cisco.com>
l---------[-rwxr-xr-x]build-root/scripts/version55
-rwxr-xr-xsrc/scripts/version54
-rw-r--r--src/vpp.am4
3 files changed, 57 insertions, 56 deletions
diff --git a/build-root/scripts/version b/build-root/scripts/version
index af447286912..8392c68b96d 100755..120000
--- a/build-root/scripts/version
+++ b/build-root/scripts/version
@@ -1,54 +1 @@
-#!/bin/bash
-
-path=$( cd "$(dirname "${BASH_SOURCE}")" ; pwd -P )
-
-cd "$path"
-
-git rev-parse 2> /dev/null
-if [ $? == 0 ]; then
- vstring=$(git describe)
-elif [ -f .version ]; then
- vstring=$(cat .version)
-else
- if [ -f ../rpm/*.gz ]; then
- vstring=$(ls ../rpm/*.gz)
- else
- exit 1
- fi
-fi
-
-TAG=$(echo ${vstring} | cut -d- -f1 | sed -e 's/^v//')
-ADD=$(echo ${vstring} | cut -s -d- -f2)
-
-git rev-parse 2> /dev/null
-if [ $? == 0 ]; then
- CMT=$(git describe --dirty --match 'v*'| cut -s -d- -f3,4)
-else
- CMT=$(echo ${vstring} | cut -s -d- -f3,4)
-fi
-CMTR=$(echo $CMT | sed 's/-/_/')
-
-if [ -n "${BUILD_NUMBER}" ]; then
- BLD="~b${BUILD_NUMBER}"
-fi
-
-if [ "$1" = "rpm-version" ]; then
- echo ${TAG}
- exit
-fi
-
-if [ "$1" = "rpm-release" ]; then
- [ -z "${ADD}" ] && echo release && exit
- echo ${ADD}${CMTR:+~${CMTR}}${BLD}
- exit
-fi
-
- if [ -n "${ADD}" ]; then
- if [ "$1" = "rpm-string" ]; then
- echo ${TAG}-${ADD}${CMTR:+~${CMTR}}${BLD}
- else
- echo ${TAG}-${ADD}${CMT:+~${CMT}}${BLD}
- fi
- else
- echo ${TAG}
-fi
+../../src/scripts/version \ No newline at end of file
diff --git a/src/scripts/version b/src/scripts/version
new file mode 100755
index 00000000000..af447286912
--- /dev/null
+++ b/src/scripts/version
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+path=$( cd "$(dirname "${BASH_SOURCE}")" ; pwd -P )
+
+cd "$path"
+
+git rev-parse 2> /dev/null
+if [ $? == 0 ]; then
+ vstring=$(git describe)
+elif [ -f .version ]; then
+ vstring=$(cat .version)
+else
+ if [ -f ../rpm/*.gz ]; then
+ vstring=$(ls ../rpm/*.gz)
+ else
+ exit 1
+ fi
+fi
+
+TAG=$(echo ${vstring} | cut -d- -f1 | sed -e 's/^v//')
+ADD=$(echo ${vstring} | cut -s -d- -f2)
+
+git rev-parse 2> /dev/null
+if [ $? == 0 ]; then
+ CMT=$(git describe --dirty --match 'v*'| cut -s -d- -f3,4)
+else
+ CMT=$(echo ${vstring} | cut -s -d- -f3,4)
+fi
+CMTR=$(echo $CMT | sed 's/-/_/')
+
+if [ -n "${BUILD_NUMBER}" ]; then
+ BLD="~b${BUILD_NUMBER}"
+fi
+
+if [ "$1" = "rpm-version" ]; then
+ echo ${TAG}
+ exit
+fi
+
+if [ "$1" = "rpm-release" ]; then
+ [ -z "${ADD}" ] && echo release && exit
+ echo ${ADD}${CMTR:+~${CMTR}}${BLD}
+ exit
+fi
+
+ if [ -n "${ADD}" ]; then
+ if [ "$1" = "rpm-string" ]; then
+ echo ${TAG}-${ADD}${CMTR:+~${CMTR}}${BLD}
+ else
+ echo ${TAG}-${ADD}${CMT:+~${CMT}}${BLD}
+ fi
+ else
+ echo ${TAG}
+fi
diff --git a/src/vpp.am b/src/vpp.am
index 1d07b90a89e..5128e8ac302 100644
--- a/src/vpp.am
+++ b/src/vpp.am
@@ -55,8 +55,8 @@ vpp/app/version.h:
@echo "#define VPP_BUILD_DATE \"$$(date)\"" > $@
@echo "#define VPP_BUILD_USER \"$$(whoami)\"" >> $@
@echo "#define VPP_BUILD_HOST \"$$(hostname)\"" >> $@
- @echo "#define VPP_BUILD_TOPDIR \"$$(git rev-parse --show-toplevel)\"" >> $@
- @echo "#define VPP_BUILD_VER \"$$(../../scripts/version)\"" >> $@
+ @echo "#define VPP_BUILD_TOPDIR \"$$(cd $(srcdir) && git rev-parse --show-toplevel)\"" >> $@
+ @echo "#define VPP_BUILD_VER \"$$($(srcdir)/scripts/version)\"" >> $@
# Generate a plugin configuration script. Misconfiguring a
# plugin can cause very subtle problems.