Mercurial > hg > buildbot
changeset 20:c1b784e9bafc
icedtea/build.sh: Select additional vms based on icedtea version.
| author | Mark Wielaard <mark@klomp.org> |
|---|---|
| date | Tue, 03 May 2011 10:44:14 +0200 |
| parents | 47fe70931ef2 |
| children | 9b2f98d18770 |
| files | icedtea/build.sh |
| diffstat | 1 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/icedtea/build.sh Tue Mar 15 11:24:00 2011 +0100 +++ b/icedtea/build.sh Tue May 03 10:44:14 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=$?