[builder] FYI: Turn on release builds

["Andrew John Hughes" <gnu_andrew at member dot fsf dot org>]

This turns back on the builder release builds
in preparation for the release.

ChangeLog:


-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

Index: Build
===================================================================
RCS file: /cvs/mauve/builder/scripts/Build,v
retrieving revision 1.7
diff -u -3 -p -u -r1.7 Build
--- Build	30 Jan 2008 20:28:59 -0000	1.7
+++ Build	16 Feb 2008 11:26:10 -0000
@@ -15,18 +15,12 @@ rm -rf build install
 StdBuild
 Report "gcc build" $? build/Log.Std || exit 1
 
-# gcc branches.
-#GcjEclipse
-#GcjEclipseJmx
-
 # Order matters here.
 Classpath
-ClasspathRelease
 Jamvm
-#JamvmFutureRelease
+JamvmRelease
 Cacao
 Ecj
-#GenericCp
 
 Japi
 RunJapi
Index: Check
===================================================================
RCS file: /cvs/mauve/builder/scripts/Check,v
retrieving revision 1.5
diff -u -3 -p -u -r1.5 Check
--- Check	13 Feb 2007 16:46:13 -0000	1.5
+++ Check	16 Feb 2008 11:26:10 -0000
@@ -26,7 +26,7 @@ if test -f libjava.sum; then
 fi
 
 # Run mauve on jamvm.
-#MauveRelease
+MauveRelease
 Mauve
 #MauveFutureRelease
 
Index: Classpath
===================================================================
RCS file: /cvs/mauve/builder/scripts/Classpath,v
retrieving revision 1.6
diff -u -3 -p -u -r1.6 Classpath
--- Classpath	18 Apr 2007 11:53:22 -0000	1.6
+++ Classpath	16 Feb 2008 11:26:10 -0000
@@ -25,37 +25,3 @@ cp build/lib/glibj.zip /var/www/dist/gli
 cp build/tools/tools.zip /var/www/dist/tools-latest.zip
 cp build/classpath-*.tar.gz  /var/www/dist/classpath-latest.tar.gz
 
-# Status "building classpath with gcj trunk"
-# (
-# add_gcc_path
-# # Classpath.
-# rm -rf build install
-# StdBuild
-# Report "classpath build with gcj trunk" $? build/Log.Std
-# )
-
-# # Now build with jikes.
-# (
-
-# rm -rf jikes-build jikes-install
-# mkdir jikes-build jikes-install
-
-# echo '===== Building classpath with jikes'
-# Status "building classpath with jikes"
-
-# (
-# cd jikes-build
-# set -e
-# exec > Log 2>&1
-
-# ../classpath/configure --prefix=$(cd ../jikes-install && pwd) \
-#     --with-jikes --enable-xmlj --enable-Werror \
-#     --enable-plugin --enable-collections --enable-local-sockets \
-#     --enable-qt-peer &&
-# make all install
-# )
-# cp jikes-build/lib/glibj.zip /var/www/dist/glibj-latest.zip
-# cp jikes-build/tools/tools.zip /var/www/dist/tools-latest.zip
-
-# Report "classpath build with jikes" $? jikes-build/Log
-# )
Index: ClasspathRelease
===================================================================
RCS file: /cvs/mauve/builder/scripts/ClasspathRelease,v
retrieving revision 1.3
diff -u -3 -p -u -r1.3 ClasspathRelease
--- ClasspathRelease	18 Apr 2007 11:53:22 -0000	1.3
+++ ClasspathRelease	16 Feb 2008 11:26:10 -0000
@@ -8,22 +8,26 @@ cd $TOP/classpath-release
 
 VERSION=`cat classpath/configure.ac|grep 'AC_INIT'|awk -F',' '{print $2}'`
 
-(cd classpath; cvs update; ./autogen.sh)
+(cd classpath; ./autogen.sh)
 
 (
-rm -rf release-build
-mkdir release-build
+rm -rf build install
+mkdir build install
 
 echo "===== Building last classpath release $VERSION"
 Status "building last classpath release $VERSION"
 
 (
-cd release-build
+cd build
 set -e
 exec > Log 2>&1
-../classpath/configure && make distcheck
+../classpath/configure --enable-Werror --prefix=$(cd ../install && pwd) && 
+make all install distcheck
 )
-Report "last classpath release $VERSION build" $? release-build/Log
+Report "last classpath release $VERSION build" $? build/Log
+
+cp build/classpath-*.tar.gz  /var/www/dist/
+cp build/lib/glibj.zip /var/www/dist/glibj-latest.zip
+cp build/tools/tools.zip /var/www/dist/tools-latest.zip
 
-cp release-build/classpath-*.tar.gz  /var/www/dist/
 )
Index: JamvmRelease
===================================================================
RCS file: /cvs/mauve/builder/scripts/JamvmRelease,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 JamvmRelease
--- JamvmRelease	19 Jun 2006 19:53:33 -0000	1.2
+++ JamvmRelease	16 Feb 2008 11:26:10 -0000
@@ -8,13 +8,16 @@ cd $TOP/jamvm-release
 rm -rf build install
 
 # Note that jamvm's autogen.sh runs configure if NOCONFIGURE isn't defined.
-#(cd jamvm
-# NOCONFIGURE=yes ./autogen.sh)
-(cd jamvm)
+(cd jamvm
+ NOCONFIGURE=yes ./autogen.sh)
 
-StdBuild --with-classpath-install-dir=$TOP/classpath-release/jikes-install \
-  --prefix=$TOP/classpath-release/jikes-install --disable-libffi
+StdBuild --with-classpath-install-dir=$TOP/classpath-release/install \
+  --prefix=$TOP/classpath-release/install --disable-libffi
 
 Report "jamvm release build" $? build/Log.Std || exit 1
 
+## hack hack, add prepared cacerts (mauve tests need this)
+mkdir -p $TOP/jamvm/install/lib/security
+cp $TOP/cacerts $TOP/jamvm/install/lib/security
+
 exit 0
Index: Mauve
===================================================================
RCS file: /cvs/mauve/builder/scripts/Mauve,v
retrieving revision 1.3
diff -u -3 -p -u -r1.3 Mauve
--- Mauve	26 Nov 2006 16:15:12 -0000	1.3
+++ Mauve	16 Feb 2008 11:26:10 -0000
@@ -24,7 +24,6 @@ cd mauve
 
 (
 exec > Log.Std 2>&1
-#./configure --with-ecj-jar=/home/cpdev/Nightly/ecj/ecj.jar &&
 ./configure --with-ecj-jar=/usr/share/java/ecj.jar --with-vm=jamvm &&
 make &&
 xvfb-run jamvm Harness gnu.testlet -vm jamvm -showpasses -timeout 180000
@@ -33,3 +32,8 @@ xvfb-run jamvm Harness gnu.testlet -vm j
 # Report "mauve -vs- jamvm" $? Log.Std
 Regressions "mauve-jamvm" $(pwd)/Log.Std
 Regressions2 "mauve-jamvm-release" "mauve-jamvm"
+
+# Diff Mauve results
+diff -u $TOP/mauve/build/mauve/Log.Std \
+$TOP/mauve/build/mauve_release/Log.Std > /var/www/mauve/release-regressions
+
Index: MauveRelease
===================================================================
RCS file: /cvs/mauve/builder/scripts/MauveRelease,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 MauveRelease
--- MauveRelease	19 Jun 2006 19:53:33 -0000	1.2
+++ MauveRelease	16 Feb 2008 11:26:10 -0000
@@ -2,16 +2,16 @@
 
 . $(dirname "$0")/Settings
 
-Status "running mauve on jamvm"
+Status "running mauve on jamvm/ecj with the last release"
 
 add_jamvm_release_path
 JAVA=jamvm
+export JAVA
+JAVAC="ecj -bootclasspath /home/cpdev/Nightly/classpath/install/share/classpath/glibj.zip"
+export JAVAC
 
 cd $TOP/mauve
 
-COMPILER="jikes -bootclasspath $TOP/classpath-release/jikes-install/share/classpath/glibj.zip"
-export COMPILER
-
 echo === Running Mauve
 
 rm -rf build
@@ -24,9 +24,9 @@ cd mauve_release
 
 (
 exec > Log.Std 2>&1
-./configure --with-ecj-jar=/home/cpdev/ecj.jar &&
+./configure --with-ecj-jar=/usr/share/java/ecj.jar --with-vm=jamvm &&
 make &&
-$JAVA Harness gnu.testlet -timeout 240000 -vm jamvm
+xvfb-run jamvm Harness gnu.testlet -vm jamvm -showpasses -timeout 180000
 )
 
 # Report "mauve -vs- jamvm" $? Log.Std
Index: Settings
===================================================================
RCS file: /cvs/mauve/builder/scripts/Settings,v
retrieving revision 1.3
diff -u -3 -p -u -r1.3 Settings
--- Settings	26 Nov 2006 16:15:12 -0000	1.3
+++ Settings	16 Feb 2008 11:26:10 -0000
@@ -41,18 +41,6 @@ add_jamvm_release_path()
    PATH=$TOP/classpath-release/jikes-install/bin:$PATH
 }
 
-# Add jamvm (future release version) to path.
-add_jamvm_future_release_path()
-{
-   PATH=$TOP/classpath-future-release/jikes-install/bin:$PATH
-}
-
-# Add gcj-eclipse dependencies path
-add_gcj_eclipse_dependencies_path()
-{
-   PATH=$TOP/gcj-eclipse/dependencies:$PATH
-}
-
 # Where messages are sent from (can be a fake address).
 REPORTFROM=cpdev@builder.classpath.org
 # Where messages are sent (comma separated).

Attachment: signature.asc
Description: Digital signature