Added Eclipse plugin build to nightly test scri...

Added Eclipse plugin build to nightly test scripts. Updated them to be
in sync with those actually used.

2 files changed, 29 insertions, 12 deletions

diff --git a/test/scala2-nightly-test.scm b/test/scala2-nightly-test.scm
index a81390f274..9f2f0c35ef 100755
--- a/test/scala2-nightly-test.scm
+++ b/test/scala2-nightly-test.scm
@@ -12,14 +12,18 @@ exec scsh -e main -s "$0" "$@"
 ;; SVN repository containing the Scala compiler.
 (define scala-svn-repository-dir
   "http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk")
+(define sep-svn-repository-dir
+  "http://lampsvn.epfl.ch/svn-repos/scala/plugin")
 
 ;; SVN module containing the compiler.
 (define scala-svn-module-name "scala")
+(define sep-svn-module-name "plugin")
 
 ;; E-mail address to which the failure notification should be sent.
 (define notify-email "scala-reports@groupes.epfl.ch")
 ;;(define notify-email "stephane.micheloud@epfl.ch") ; DEBUG
 ;;(define notify-email "lex.spoon@epfl.ch") ; DEBUG
+;;(define notify-email "gilles.dubochet@epfl.ch") ; DEBUG
 
 ;; Directory in which the distribution should be built.
 (define nightly-build-dir
@@ -79,17 +83,20 @@ exec scsh -e main -s "$0" "$@"
           (with-cwd scala-svn-module-name
                     (start-section "Creating small Scala distribution")
                     (fail-if-error (run (ant pack)))
-;;                  (fail-if-error (run (ant msil)))
                     (run (ant msil))
                     (start-section "Testing Scala compiler")
                     (fail-if-error
-                     (run (./test/scalatest --color=none
-                                            --show-log)))
-;;                  (start-section "Creating nightly distribution")
-;;                  (run (rm -rf ,nightly-build-dir))
-;;                  (create-directory nightly-build-dir)
-;;                  (fail-if-error (run (ant dist) (< /dev/null)))
-                    #t)))
+                      (run (./test/scalatest --color=none
+                                             --show-log))))
+          (start-section "Checking out Plugin module")
+          (fail-if-error (run (svn co ,plugin-svn-repository-dir
+                                   ,plugin-svn-module-name)))
+          (with-cwd plugin-svn-module-name
+                    (start-section "Creating Scala Eclipse plugin")
+                    (fail-if-error (run (ant dist))))
+          #t
+        )
+      )
       (lambda ()
         (start-section "Ending time")
         (display (format-date "~Y-~m-~d ~H:~M ~Z\n" (date))))))
diff --git a/test/scala2-nightly-test.sh b/test/scala2-nightly-test.sh
index a62ce85825..448b6edddc 100755
--- a/test/scala2-nightly-test.sh
+++ b/test/scala2-nightly-test.sh
@@ -7,15 +7,20 @@ ANT_HOME=/home/linuxsoft/apps/ant
 JAVA_HOME=/home/linuxsoft/apps/$JAVA_SDK
 # uses scsh wrapper in ~/bin instead (mics)
 #SCSH_HOME=/home/linuxsoft/apps/scsh-rh9
-MONO_HOME=/home/linuxsoft/apps/mono
+# Mono on linuxsoft is a 32-bit distro
+#MONO_HOME=/home/linuxsoft/apps/mono
+MONO_HOME=/opt/mono
 KVEM_HOME=/home/linuxsoft/apps/java-wtk
+RETROWEAVER_HOME=/home/linuxsoft/apps/retroweaver
 
 [ -d "$JAVA_HOME" ] || (echo "Invalid directory $JAVA_HOME"; exit 1 )
 
 PATH=/usr/local/bin:/bin:/usr/bin:/usr/sbin
 PATH=$ANT_HOME/bin:$JAVA_HOME/bin:$MONO_HOME/bin:$ANDROID_HOME/tools:$KVEM_HOME/bin:~/bin:$PATH
 
-ANT_OPTS="-Xms1024M -Xmx1024M"
+LD_LIBRARY_PATH=/lib:/usr/lib
+
+ANT_OPTS="-Xms1024M -Xmx1024M -XX:MaxPermSize=96M"
 BUILD_DATE=`date +"%Y-%m-%d"`
 
 OUTPUT_DIR=~/scala-nightly-test/$JAVA_SDK
@@ -32,16 +37,21 @@ killall -9 scshvm 2>1
 killall -9 java 2>1
 
 env PATH="$PATH" ANT_OPTS="$ANT_OPTS" JAVACMD="$JAVACMD" \
-    ANDROID_HOME="$ANDROID_HOME" \
+    ANDROID_HOME="$ANDROID_HOME" RETROWEAVER_HOME="$RETROWEAVER_HOME" \
     ~/bin/scala2-nightly-test.scm $OUTPUT_DIR 
 
+# only build for Java 1.5 is made available on the page
+# http://www.scala-lang.org/downloads/distrib/files/nightly/
 [ "$JAVA_SDK"="java-1.5" ] || exit 0
 
 if [ -d "$LATEST_DIR" ] && [ `ls "$LATEST_DIR"/*.zip 2>1 | wc -l` -gt 0 ]; then
     (rm -rf $NIGHTLY_DIR && mkdir $NIGHTLY_DIR)
     (cd $LATEST_DIR && cp *.tgz *.zip *.md5 *.sbp *.advert $NIGHTLY_DIR)
     (cd $TARGET_DIR && cp log-scala2 $NIGHTLY_DIR)
-    (cd $NIGHTLY_DIR && mkdir scala && cd scala && tar xzf ../scala-*[^sources].tgz)
+    (cd $NIGHTLY_DIR && tar xzf scala-*[^sources].tgz)
+    (cd $NIGHTLY_DIR && for f in *.sbp; do ln -sf $f `echo $f | sed -e 's/\(scala[a-z\-]*[0-9]\+\.[0-9]\+\.[0-9]\+\).*\(\.sbp\)/\1-latest\2/g'`; done)
+    (cd $NIGHTLY_DIR && for f in *.tgz; do ln -sf $f `echo $f | sed -e 's/\(scala[a-z\-]*[0-9]\+\.[0-9]\+\.[0-9]\+\).*\(\.tgz\)/\1-latest\2/g'`; done)
+    (cd $NIGHTLY_DIR && for f in *.zip; do ln -sf $f `echo $f | sed -e 's/\(scala[a-z\-]*[0-9]\+\.[0-9]\+\.[0-9]\+\).*\(\.zip\)/\1-latest\2/g'`; done)
 fi
 if [ -d "$BUILD_DIR/api-compiler" ] && [ -d "$NIGHTLY_DIR/scala/doc/scala" ]; then
     cp -r $BUILD_DIR/api-compiler $NIGHTLY_DIR/scala/doc/scala