distro-dependent make variables renamed

diff --git a/scripts/nightly-build.sh b/scripts/nightly-build.sh
index 442f6e4..63b2aca 100755 (executable)
--- a/scripts/nightly-build.sh
+++ b/scripts/nightly-build.sh
@@ -11,7 +11,7 @@ CHROOTBINDIR=/root/bin
 SVNPATH="svn+ssh://build@svn.one-lab.org/svn/build/trunk"
 DISTRO=onelab
 MAILTO="onelab-build@one-lab.org"
-TAGSFILE=onelab-tags.mk
+DISTROMAKETAGS=onelab-tags.mk
 
 TESTBUILDURL="http://build.one-lab.org/"
 TESTBOXSSH=root@onelab-test.inria.fr
@@ -83,18 +83,18 @@ function build () {
     cd $ROOT
     svn co $SVNPATH $BASE
 
-  # if TAGSTAG specified : update TAGSFILE with this tag
+  # if TAGSTAG specified : update DISTROMAKETAGS with this tag
     if [ -n "$TAGSTAG" ] ; then
        cd $BASE
-       svn up -r $TAGSTAG $TAGSFILE
+       svn up -r $TAGSTAG $DISTROMAKETAGS
        cd -
     fi
 
     show_env
     
     echo "Running make IN build $(pwd)"
-    make stage1=true ${MAKEOPTS[@]} TAGSFILE=${TAGSFILE} PLDISTRO=${DISTRO} ${MAKEVARS[@]} -C $BASE $MAKETARGETS
-    make ${MAKEOPTS[@]} TAGSFILE=${TAGSFILE} PLDISTRO=${DISTRO} ${MAKEVARS[@]} -C $BASE $MAKETARGETS
+    make stage1=true ${MAKEOPTS[@]} DISTROMAKETAGS=${DISTROMAKETAGS} PLDISTRO=${DISTRO} ${MAKEVARS[@]} -C $BASE $MAKETARGETS
+    make ${MAKEOPTS[@]} DISTROMAKETAGS=${DISTROMAKETAGS} PLDISTRO=${DISTRO} ${MAKEVARS[@]} -C $BASE $MAKETARGETS
 
     # restore silent mode - otherwise cron gets it
     set +x
@@ -138,10 +138,10 @@ function show_env () {
     echo SVNPATH=$SVNPATH
     echo MAKEVARS="${MAKEVARS[@]}"
     echo MAKEOPTS="${MAKEOPTS[@]}"
-    echo TAGSFILE="$TAGSFILE"
+    echo DISTROMAKETAGS="$DISTROMAKETAGS"
     echo TAGSTAG="$TAGSTAG"
-    echo "XXXXXXXXXXXXXXXXXXXX Contents of tags definition file $TAGSFILE"
-    cat $BASE/$TAGSFILE
+    echo "XXXXXXXXXXXXXXXXXXXX Contents of tags definition file $DISTROMAKETAGS"
+    cat $BASE/$DISTROMAKETAGS
     echo "XXXXXXXXXXXXXXXXXXXX end tags definition"
 }
 
@@ -152,8 +152,8 @@ function usage () {
     echo " -b BASE - may include @, then replaced with current date"
     echo " -u : uses directory given as BASE as is, even if already exists"
     echo " -d DISTRO"
-    echo " -t TAGSFILE"
-    echo " -r TAGSTAG - a tag that refers to TAGSFILE - defaults to HEAD"
+    echo " -t DISTROMAKETAGS"
+    echo " -r TAGSTAG - a tag that refers to DISTROMAKETAGS - defaults to HEAD"
     echo " -s MAKEVAR=value - spaces in value are not supported"
     echo " -n dry-run : -n passed to make - no mail sent"
     echo " -m MAILTO"
@@ -177,7 +177,7 @@ function main () {
                b) BASE=$OPTARG ;;
                u) USEOLD=true ;;
                d) DISTRO=$OPTARG ;;
-               t) TAGSFILE=$OPTARG ;;
+               t) DISTROMAKETAGS=$OPTARG ;;
                r) TAGSTAG=$OPTARG ;;
                s) MAKEVARS=(${MAKEVARS[@]} $OPTARG) ;;
                n) MAILTO="" ; MAKEOPTS=(${MAKEOPTS[@]} -n) ;;