------------------------------------------------------------
revno: 11738
revision-id: squidadm@squid-cache.org-20110915140743-drcp5yyl7ojpjxb8
parent: rousskov@measurement-factory.com-20110915034450-mweesz466bx3twxh
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: trunk
timestamp: Thu 2011-09-15 08:07:43 -0600
message:
  Maintenance: snapshot needs to cope with out-of-tree builds
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20110915140743-\
#   drcp5yyl7ojpjxb8
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 3580a55d0aefb4fce2c32b6af8824d2c39199310
# timestamp: 2011-09-15 14:11:22 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: rousskov@measurement-factory.com-20110915034450-\
#   mweesz466bx3twxh
# 
# Begin patch
=== modified file 'mksnapshot-cron.sh'
--- mksnapshot-cron.sh	2011-08-24 14:05:19 +0000
+++ mksnapshot-cron.sh	2011-09-15 14:07:43 +0000
@@ -83,14 +83,6 @@
 	;;
     esac
   done
-
-  # update web page
-  if [ -x ${dst}/make.sh ]; then
-    cd ${dst}
-    ./make.sh
-    cd ${top}/../release
-  fi
-
 } }
 
 set +e

=== modified file 'mksnapshot.sh'
--- mksnapshot.sh	2011-09-09 09:28:19 +0000
+++ mksnapshot.sh	2011-09-15 14:07:43 +0000
@@ -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 @@
 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 @@
 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