/hg/buildbot: 2 new changesets

[mjw at icedtea.classpath.org]

changeset c1b784e9bafc in /hg/buildbot
details: http://icedtea.classpath.org/hg/buildbot?cmd=changeset;node=c1b784e9bafc
author: Mark Wielaard <mark at klomp.org>
date: Tue May 03 10:44:14 2011 +0200

	icedtea/build.sh: Select additional vms based on icedtea version.


changeset 9b2f98d18770 in /hg/buildbot
details: http://icedtea.classpath.org/hg/buildbot?cmd=changeset;node=9b2f98d18770
author: Mark Wielaard <mark at klomp.org>
date: Tue May 03 10:45:42 2011 +0200

	icedtea/master.cfg: icedtea6-squeeze-x86_64-full don't build cacao.


diffstat:

 icedtea/build.sh   |  9 ++++++++-
 icedtea/master.cfg |  2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r 47fe70931ef2 -r 9b2f98d18770 icedtea/build.sh
--- a/icedtea/build.sh	Tue Mar 15 11:24:00 2011 +0100
+++ b/icedtea/build.sh	Tue May 03 10:45:42 2011 +0200
@@ -100,6 +100,13 @@
 # Make sure a failure in any command in a pipe, fails the whole pipe command.
 set -o pipefail
 
+# Some additional VMs only build against one or the other version.
+if [ "$1" == "6"]; then
+ ICEDTEA_ADDITIONAL_VMS="cacao,jamvm,shark"
+elif [ "$1" == "7" ]; then
+ ICEDTEA_ADDITIONAL_VMS="shark"
+fi
+
 # Build in separate dir.
 # Figure out a way to use local openjdk tar.gz files
 # maybe just copy to to an archive dir before cleanup and then copy back.
@@ -108,7 +115,7 @@
 	&& cd $ICEDTEA_BUILD_DIR \
 	&& $ICEDTEA_DIR/configure \
 		--enable-nss \
-		--with-additional-vms=cacao,shark \
+		--with-additional-vms=$ICEDTEA_ADDITIONAL_VMS \
 	&& make VERBOSE=true) 2>&1 | tee $BUILD_LOG_FILE
 BUILD_RESULT=$?
 
diff -r 47fe70931ef2 -r 9b2f98d18770 icedtea/master.cfg
--- a/icedtea/master.cfg	Tue Mar 15 11:24:00 2011 +0100
+++ b/icedtea/master.cfg	Tue May 03 10:45:42 2011 +0200
@@ -737,7 +737,7 @@
                               "--enable-optimizations",
                               "--enable-docs",
                               "--enable-nss",
-                              "--with-additional-vms=cacao,shark",
+                              "--with-additional-vms=shark",
                               "--with-parallel-jobs=4",
                               "--with-llvm-config=llvm-config-2.7"],
                               workdir="build"))