-b base

diff --git a/scripts/all-builds.sh b/scripts/all-builds.sh
index 55ce3a4..947a6ae 100755 (executable)
--- a/scripts/all-builds.sh
+++ b/scripts/all-builds.sh
@@ -8,7 +8,8 @@ COMMAND=$(basename $0)
 function usage () {
     echo "Usage: $COMMAND"
     echo "In manual mode you should export the following vars (or use related option)"
-    echo "PLDISTROS (-d) FCDISTROS (-f) BITS (-b) TRUNK_DISTRO (-td) RETRY (-O) TEST (-T) DRY_RUN (-n)"
+    echo "PLDISTROS (-d) FCDISTROS (-f) BITS (-i) TRUNK_DISTRO (-td) BASE (-b)"
+    echo "RETRY (-O) TEST (-T) DRY_RUN (-n)"
     exit 1
 }
 
@@ -16,8 +17,9 @@ while [[ -n "$@" ]] ; do
     case "$1" in
        -d) shift ; PLDISTROS="$PLDISTROS $1" ;;
        -f) shift ; FCDISTROS="$FCDISTROS $1" ;;
-       -b) shift ; BITS="$BITS $1" ;;
+       -i) shift ; BITS="$BITS $1" ;;
        -td) shift; TRUNK_DISTRO="$1" ;;
+       -b) shift; BASE="$1" ;;
        -O) RETRY=true ;;
        -T) TEST=true ;;
        -n) DRY_RUN=true ;;
@@ -34,18 +36,20 @@ DEFAULT_PLDISTROS="planetlab onelab"
 DEFAULT_FCDISTROS="f8"
 DEFAULT_BITS="32 64"
 DEFAULT_TRUNK_DISTRO=onelab
+DEFAULT_BASE="@DATE@"
 
 # export any of these to override - this is for manual use only
 if [ -z "$PLDISTROS" ] ;       then PLDISTROS=$DEFAULT_PLDISTROS ;             else manual=true ; fi
 if [ -z "$FCDISTROS" ] ;       then FCDISTROS=$DEFAULT_FCDISTROS ;             else manual=true ; fi
 if [ -z "$BITS" ] ;            then BITS=$DEFAULT_BITS ;                       else manual=true ; fi
 if [ -z "$TRUNK_DISTRO" ] ;    then TRUNK_DISTRO=$DEFAULT_TRUNK_DISTRO ;       else manual=true ; fi
+if [ -z "$BASE" ] ;            then BASE=$DEFAULT_BASE ;                       else manual=true ; fi
 [ -n "$RETRY" ] &&     { extra_option="$extra_option -o" ; manual=true ; }
 [ -n "$TEST" ] &&      { extra_option="$extra_option -T" ; manual=true ; }
 [ -n "$DRY_RUN" ] &&   { manual=true ; }
 
 function run () {
-    [ -n "$manual" ] && echo "$@"
+    [ -n "$manual" ] && echo "$@" '; \'
     if [ -z "$DRY_RUN" ] ; then
        "$@"
     fi
@@ -66,7 +70,7 @@ for d in $PLDISTROS ; do
        for bits in $BITS; do
            p=linux${bits}
            s=$(shortname $d)
-           buildname="@DATE@--${s}.4.2--${f}-${bits}"
+           buildname="${BASE}--${s}.4.2--${f}-${bits}"
 #          buildname="${d}-4.2-rc2.1lab-${f}-${bits}"
            command="/root/bin/vbuild-nightly.sh -m onelab-build@one-lab.org \
                -d $d -p $p -f $f -t ${d}-tags-4.2.mk \
@@ -85,7 +89,7 @@ if [ -z "$TEST" ] ; then
        for bits in $BITS ; do
            p=linux${bits}
            s=$(shortname $d)
-           buildname="@DATE@--tr${s}-c5vs-${bits}"
+           buildname="${BASE}--tr${s}-c5vs-${bits}"
 #          buildname="${d}-4.2-rc2.1lab-${f}-${bits}"
            command="/root/bin/vbuild-nightly.sh -m onelab-build@one-lab.org \
            -d $d -p $p -f $f -t ${d}-tags-4.2.mk \
@@ -101,7 +105,7 @@ for d in $TRUNK_DISTRO; do
     for bits in $BITS; do
        p=linux${bits}
        s=$(shortname $d)
-       buildname="@DATE@--tr${s}-${bits}"
+       buildname="${BASE}--tr${s}-${bits}"
        command="/root/bin/vbuild-nightly.sh -m onelab-build@one-lab.org \
         -d $d -p $p -b $buildname $extra_option"
        run $command