merges lost changes for new svn setup and usage -- handles distro=planetlab gracefully

diff --git a/scripts/nightly-build.sh b/scripts/nightly-build.sh
index 20deed3..6c74036 100755 (executable)
--- a/scripts/nightly-build.sh
+++ b/scripts/nightly-build.sh
@@ -6,16 +6,25 @@ CVSROOT=":pserver:anon@cvs.planet-lab.org:/cvs"
 DISTRO=onelab
 MAILTO="thierry.parmentelat@sophia.inria.fr"
 TAG=HEAD
+CHROOTDIR=/root/bin
 
 # plc chroot runs in UTC
 date=$(date -u +'%Y.%m.%d')
 
+function usage () {
+  echo "$COMMAND [option]"
+  echo " -d CVSROOT"
+  echo " -r TAG"
+  echo " -m MAILTO"
+  echo " -f DISTRO"
+  echo " -b BASE"
+  exit 1
+}
+
 ### in the root context
 function do_chroot () {
-  cd /build/custom
-  (date ; svn update) >> update.log 2>&1
   chroot /plc/devel/root su - build <<EOF
-$ROOT/nightly.sh $@
+$CHROOTDIR/$COMMAND $@
 EOF
 }
 
@@ -70,16 +79,18 @@ function manage_distro () {
 #    exit 1
 #  fi
 #
-  DISTROFILE=$BUILD/$DISTRO.xml
-
-  if [ -f $DISTROFILE ] ; then
-    echo Using $DISTROFILE
-  elif [ -f $ROOT/$DISTRO.xml ] ; then
-    echo Using $ROOT/$DISTRO.xml
-    ln -s $ROOT/$DISTRO.xml $DISTROFILE
-  else
-    echo Could not locate $DISTRO.xml
-    exit 1
+  if "$DISTRO" != planetlab; then
+    DISTROFILE=$BUILD/$DISTRO.xml
+
+    if [ -f $DISTROFILE ] ; then
+      echo Using $DISTROFILE
+    elif [ -f $ROOT/$DISTRO.xml ] ; then
+      echo Using $ROOT/$DISTRO.xml
+      ln -s $ROOT/$DISTRO.xml $DISTROFILE
+    else
+      echo Could not locate $DISTRO.xml
+      exit 1
+    fi
   fi
 
 }