ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix version.h generation for out-of-tree builds

Browse Source 
Change-Id: Ic882f5aec74858a36533ed8cd61a7726947dceef
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2017-01-03 19:56:43 +01:00
committed by John Lo
parent 5ac9bf53b3
commit 99c201964a
3 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
build-root/scripts/version
View File

@ -1,54 +0,0 @@
#!/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

1
build-root/scripts/version Symbolic link
View File

@ -0,0 +1 @@
../../src/scripts/version

54
src/scripts/version Executable file
View File

@ -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

4
src/vpp.am
View File

@ -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.