From e3573451272a1774d6b7e9dbf4cedaf1b673414b Mon Sep 17 00:00:00 2001
From: thierry <thierry@41d37cc5-eb28-0410-a9bf-d37491348ade>
Date: Mon, 19 Mar 2007 09:20:21 +0000
Subject: [PATCH] do not set TAG anymore, set TAGSFILE instead

---
 scripts/nightly-build.sh | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/scripts/nightly-build.sh b/scripts/nightly-build.sh
index 739f42f..923ee2e 100755
--- a/scripts/nightly-build.sh
+++ b/scripts/nightly-build.sh
@@ -5,12 +5,15 @@ REVISION=$(echo '$Revision$' | sed -e 's,\$,,g' -e 's,^\w*:\s,,' )
 
 COMMAND=$(basename $0)
 ROOT=/build
+CHROOTBINDIR=/root/bin
+
+# default values, tunable with command-line options
 CVSROOT=":pserver:anon@cvs.planet-lab.org:/cvs"
 DISTRO=onelab
 MAILTO="onelab-build@one-lab.org"
-TAG=HEAD
-CHROOTBINDIR=/root/bin
+TAGSFILE=onelab-tags.mk
 
+####################
 # plc chroot runs in UTC
 DATE=$(date -u +'%Y.%m.%d')
 
@@ -71,7 +74,7 @@ function build () {
   cvs -d $CVSROOT co -d $BASE build
 
   echo "Running make IN build $(pwd)"
-  make ${MAKEOPTS[@]} TAG=${TAG} PLDISTRO=${DISTRO} ${MAKEVARS[@]} -C $BASE $MAKETARGETS
+  make ${MAKEOPTS[@]} TAGSFILE=${TAGSFILE} PLDISTRO=${DISTRO} ${MAKEVARS[@]} -C $BASE $MAKETARGETS
 
   # only if successful
   rm -f latest
@@ -83,10 +86,13 @@ function build () {
 function show_env () {
   echo ROOT=$ROOT
   echo BASE=$BASE
-  echo TAG=$TAG
   echo DISTRO=$DISTRO
   echo MAKEVARS="${MAKEVARS[@]}"
   echo MAKEOPTS="${MAKEOPTS[@]}"
+  echo TAGSFILE=$TAGSFILE
+  echo "XXXXXXXXXXXXXXXXXXXX Contents of $TAGSFILE"
+  cat $TAGSFILE
+  echo "XXXXXXXXXXXXXXXXXXXX end contents"
 }
 
 function usage () {
@@ -99,7 +105,7 @@ function usage () {
   echo " -e : exits (does nothing) if BASE already exists"
   echo " -f DISTRO"
   echo " -d CVSROOT"
-  echo " -r TAG"
+  echo " -r TAGSFILE"
   echo " -m MAILTO"
   echo " -s MAKEVAR=value - spaces in value are not supported"
   echo " -n passed to make"
@@ -117,7 +123,7 @@ function main () {
       case $opt in
 	v) set -x ;;
 	d) CVSROOT=$OPTARG ;;
-        r) TAG=$OPTARG ;;
+        r) TAGSFILE=$OPTARG ;;
         m) MAILTO=$OPTARG ;;
         f) DISTRO=$OPTARG ;;
         b) BASE=$OPTARG ;;
@@ -136,8 +142,8 @@ function main () {
     MAKETARGETS="$@"
 
     cd $ROOT
-    ### set BASE from TAG, if unspecified
-    [ -z "$BASE" ] && BASE=${TAG}
+    ### set BASE from DISTRO, if unspecified
+    [ -z "$BASE" ] && BASE=${DISTRO}
 
     if [ -n "$EXITIFOLD" -a -d "$BASE" ] ; then
       echo "$COMMAND: -e : exits on existing base directory $BASE"
-- 
2.47.0