From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Thu, 15 Sep 2011 14:07:43 +0000 (-0600)
Subject: Maintenance: snapshot needs to cope with out-of-tree builds
X-Git-Tag: BumpSslServerFirst.take01~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b0e4b91255e33427bd4e8376c57df4cbb963db1;p=thirdparty%2Fsquid.git

Maintenance: snapshot needs to cope with out-of-tree builds
---

diff --git a/mksnapshot-cron.sh b/mksnapshot-cron.sh
index af1b9d81fd..4244b795b2 100755
--- a/mksnapshot-cron.sh
+++ b/mksnapshot-cron.sh
@@ -83,14 +83,6 @@ make_snapshot()
 	;;
     esac
   done
-
-  # update web page
-  if [ -x ${dst}/make.sh ]; then
-    cd ${dst}
-    ./make.sh
-    cd ${top}/../release
-  fi
-
 } }
 
 set +e
diff --git a/mksnapshot.sh b/mksnapshot.sh
index d035cbbdcd..563b4b39d5 100755
--- a/mksnapshot.sh
+++ b/mksnapshot.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-
+echo "RUN: $0"
 if [ $# -lt 1 ]; then
 	echo "Usage: $0 [branch]"
 	echo "Where [branch] is the path under /bzr/ to the branch to snapshot."
@@ -17,9 +17,6 @@ branchpath=${1:-trunk}
 tag=${2:-`basename $branchpath`}
 startdir=${PWD}
 date=`env TZ=GMT date +%Y%m%d`
-revision=`bzr revno`
-
-suffix="${date}-r${revision}"
 
 tmpdir=${TMPDIR:-${PWD}}/${module}-${tag}-mksnapshot
 
@@ -36,6 +33,8 @@ if [ ! -f ${tmpdir}/configure ]; then
 fi
 
 cd ${tmpdir}
+revision=`bzr revno ${BZRROOT}/${module}/${branchpath}`
+suffix="${date}-r${revision}"
 eval `grep "^ *PACKAGE_VERSION=" configure | sed -e 's/-BZR//' | sed -e 's/PACKAGE_//'`
 eval `grep "^ *PACKAGE_TARNAME=" configure | sed -e 's/_TARNAME//'`
 ed -s configure.ac <<EOS