From 9d12d3ced540930f4f661441480aeae1a6e98af8 Mon Sep 17 00:00:00 2001 From: ramonn Date: Thu, 27 Oct 2011 16:50:37 +0000 Subject: [PATCH] 2011-10-27 Ramon Novoa * build_src.sh: Include build number in tarballs for nightly builds. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5088 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- extras/ChangeLog | 4 ++++ extras/build_src.sh | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/extras/ChangeLog b/extras/ChangeLog index 2c206e7ab3..58ab54b327 100644 --- a/extras/ChangeLog +++ b/extras/ChangeLog @@ -1,3 +1,7 @@ +2011-10-27 Ramon Novoa + + * build_src.sh: Include build number in tarballs for nightly builds. + 2011-10-27 Ramon Novoa * pandora_update_version.sh: Include build number in deb package diff --git a/extras/build_src.sh b/extras/build_src.sh index 2d1e8a8b8a..9eaf696313 100755 --- a/extras/build_src.sh +++ b/extras/build_src.sh @@ -3,8 +3,14 @@ CODEHOME=~/code/pandora/trunk CODEHOME_ENT=~/code/artica/code RPMHOME=/usr/src/packages VERSION=$(grep 'my $pandora_version =' $CODEHOME/pandora_server/lib/PandoraFMS/Config.pm | awk '{print substr($4, 2, length($4) - 3)}') +BUILD=$(grep 'my $pandora_build =' $CODEHOME/pandora_server/lib/PandoraFMS/Config.pm | awk '{print substr($4, 2, length($4) - 3)}') KEYGEN_VERSION=$(grep "%define version" $CODEHOME_ENT/updatemanager/keygen/pandora/pandora_keygen.spec | awk '{print $3}') +# Add build string for nightly builds +if [ "$1" == "nightly" ]; then + VERSION="$VERSION-$BUILD" +fi + if [ ! -d $RPMHOME/SOURCES ]; then mkdir -p $RPMHOME/SOURCES || exit 1 fi