updated nightly build scripts

2 files changed, 39 insertions, 17 deletions

diff --git a/test/scala2-nightly-test.scm b/test/scala2-nightly-test.scm
index 116711d3f3..b56a5e2663 100755
--- a/test/scala2-nightly-test.scm
+++ b/test/scala2-nightly-test.scm
@@ -17,23 +17,17 @@ exec scsh -e main -s "$0" "$@"
 (define scala-svn-module-name "scala")
 
 ;; E-mail address to which the failure notification should be sent.
-(define notify-emails '("scala-devel@groupes.epfl.ch"))
-;;(define notify-emails '("stephane.micheloud@epfl.ch")) ; DEBUG
-
+(define notify-email "scala-devel@groupes.epfl.ch")
+;;(define notify-email "stephane.micheloud@epfl.ch") ; DEBUG
+;;(define notify-email "lex.spoon@epfl.ch") ; DEBUG
 
 ;; Directory in which the distribution should be built.
-;(define nightly-build-dir
-;  (expand-file-name "~linuxsoft/archives/scala/nightly-scala2"))
+(define nightly-build-dir
+;;  (expand-file-name "~lex/scala/nightly"))  ; DEBUG
+    (expand-file-name "~linuxsoft/archives/scala/nightly"))
 
 ;; End of configuration section.
 
-(define (flatten-with-commas lst)
-  (cond
-   ((null? lst) "")
-   (#t (fold (lambda (s accum) (string-append accum ", " s))
-	     (car lst)
-	     (cdr lst)))))
-
 (define (main cmd-line)
   (let ((prog (car cmd-line))
         (args (cdr cmd-line)))
@@ -84,7 +78,7 @@ exec scsh -e main -s "$0" "$@"
                                    ,scala-svn-module-name)))
           (with-cwd scala-svn-module-name
                     (start-section "Creating small Scala distribution")
-                    (fail-if-error (run (ant dist)))
+                    (fail-if-error (run (ant pack)))
                     (start-section "Testing Scala compiler")
                     (fail-if-error
                      (run (./test/scalatest --color=none
@@ -100,10 +94,10 @@ exec scsh -e main -s "$0" "$@"
 
 (define (send-warning-mail log-file-name link-name)
   (send-mail
-   notify-emails
+   notify-email
    `(("Subject"  . "Failure of nightly Scala 2 test")
-     ("To"       . ,(flatten-with-commas notify-emails))
-     ("Reply-To" . ,(car notify-emails)))
+     ("To"       . ,notify-email)
+     ("Reply-To" . ,notify-email))
    (string-append
     "Tonight's automatic Scala test failed. More details can be found\n"
     "in file "log-file-name"\n"
@@ -122,7 +116,7 @@ exec scsh -e main -s "$0" "$@"
     (newline mail-port)
     (write-string body mail-port)
     (newline mail-port)
-    (run (sendmail "-i" ,@to)
+    (run (sendmail "-i" ,to)
          (<< ,(string-output-port-output mail-port)))))
 
 ;;; Local Variables:
diff --git a/test/scala2-nightly-test.sh b/test/scala2-nightly-test.sh
new file mode 100755
index 0000000000..5af95b318d
--- /dev/null
+++ b/test/scala2-nightly-test.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+if [ -z "$JAVA_VERSION" ]; then
+    JAVA_VERSION=1.5
+fi
+
+ANT_HOME=/home/linuxsoft/apps/ant
+JAVA_HOME=/home/linuxsoft/apps/java-$JAVA_VERSION
+SCSH_HOME=/home/linuxsoft/apps/scsh-rh9
+
+PATH=/usr/local/bin:/bin:/usr/bin:/usr/sbin
+PATH=$ANT_HOME/bin:$JAVA_HOME/bin:$SCSH_HOME/bin:$PATH
+
+ANT_OPTS="-Xms256M -Xmx512M"
+BUILD_DATE=`date +"%Y-%m-%d"`
+
+OUTPUT_DIR=~/scala-nightly-test/java-$JAVA_VERSION
+BUILD_DIR=$OUTPUT_DIR/$BUILD_DATE-scala2
+LATEST_DIR=$BUILD_DIR/scala/dists
+NIGHTLY_DIR=/home/linuxsoft/archives/scala/nightly
+
+env PATH="$PATH" ANT_OPTS="$ANT_OPTS" ~/bin/scala2-nightly-test.scm $OUTPUT_DIR 
+
+if [ -d "$LATEST_DIR" ] && [ `ls "$LATEST_DIR"/*.zip | wc -l` -gt 0 ]; then
+    (rm -rf $NIGHTLY_DIR && mkdir $NIGHTLY_DIR)
+    (cd $LATEST_DIR && cp *.tgz *.zip *.md5 *.sbp *.advert $NIGHTLY_DIR)
+    (cd $BUILD_DIR && cp log-scala2 $NIGHTLY_DIR)
+fi