updated nightly build scripts

1 files changed, 11 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: