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

diff --git a/mksnapshot-cron.sh b/mksnapshot-cron.sh
index af1b9d81fd6dcf124f8ed5293cf38bdc60c05651..4244b795b2e46f98e141a65a488d16ef669cc4aa 100755 (executable)
--- 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 d035cbbdcd620a9f0d19dbcdd3bc3ea6daea5052..563b4b39d52bd735579c82e607f89eca8dcf1822 100755 (executable)
--- 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