From: thierry <thierry@41d37cc5-eb28-0410-a9bf-d37491348ade>
Date: Mon, 19 Mar 2007 09:46:36 +0000 (+0000)
Subject: review all options - adds -r again but that refers to tagsfile
X-Git-Tag: foo~506
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b02fb521348ce904ba9cb0db57934b8514712f78;p=infrastructure.git

review all options - adds -r again but that refers to tagsfile
---

diff --git a/scripts/nightly-build.sh b/scripts/nightly-build.sh
index 923ee2e..1c0172a 100755
--- a/scripts/nightly-build.sh
+++ b/scripts/nightly-build.sh
@@ -73,6 +73,13 @@ function build () {
   cd $ROOT
   cvs -d $CVSROOT co -d $BASE build
 
+  # if TAGSTAG specified : update TAGSFILE with this tag
+  if [ -n "$TAGSTAG" ] ; then
+    cd $BASE
+    cvs up -r $TAGSTAG $TAGSFILE
+    cd -
+  fi
+
   echo "Running make IN build $(pwd)"
   make ${MAKEOPTS[@]} TAGSFILE=${TAGSFILE} PLDISTRO=${DISTRO} ${MAKEVARS[@]} -C $BASE $MAKETARGETS
 
@@ -103,9 +110,10 @@ function usage () {
   echo " -b BASE"
   echo " -u : uses directory given as BASE as is, even if already exists"
   echo " -e : exits (does nothing) if BASE already exists"
-  echo " -f DISTRO"
-  echo " -d CVSROOT"
-  echo " -r TAGSFILE"
+  echo " -c CVSROOT"
+  echo " -d DISTRO"
+  echo " -t TAGSFILE"
+  echo " -r TAGSTAG - a tag that refers to TAGSFILE - defaults to HEAD"
   echo " -m MAILTO"
   echo " -s MAKEVAR=value - spaces in value are not supported"
   echo " -n passed to make"
@@ -119,13 +127,14 @@ function main () {
   else
     MAKEVARS=()
     MAKEOPTS=()
-    while getopts "vd:r:m:f:b:s:uenh" opt ; do
+    while getopts "vc:t:r:m:d:b:s:uenh" opt ; do
       case $opt in
 	v) set -x ;;
-	d) CVSROOT=$OPTARG ;;
-        r) TAGSFILE=$OPTARG ;;
+	c) CVSROOT=$OPTARG ;;
+        t) TAGSFILE=$OPTARG ;;
+	r) TAGSTAG=$OPTARG ;;
         m) MAILTO=$OPTARG ;;
-        f) DISTRO=$OPTARG ;;
+        d) DISTRO=$OPTARG ;;
         b) BASE=$OPTARG ;;
         u) USEOLD=true ;;
 	e) EXITIFOLD=true ;;