geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r720579 - in /geronimo/gbuild/daily_build_scripts: gbuild.sh tck.sh testsuite.sh trunk16.cfg
Date Tue, 25 Nov 2008 19:59:22 GMT
Author: gawor
Date: Tue Nov 25 11:59:22 2008
New Revision: 720579

URL: http://svn.apache.org/viewvc?rev=720579&view=rev
Log:
allow to configure jdk used for testsuites and tck

Modified:
    geronimo/gbuild/daily_build_scripts/gbuild.sh
    geronimo/gbuild/daily_build_scripts/tck.sh
    geronimo/gbuild/daily_build_scripts/testsuite.sh
    geronimo/gbuild/daily_build_scripts/trunk16.cfg

Modified: geronimo/gbuild/daily_build_scripts/gbuild.sh
URL: http://svn.apache.org/viewvc/geronimo/gbuild/daily_build_scripts/gbuild.sh?rev=720579&r1=720578&r2=720579&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/gbuild.sh (original)
+++ geronimo/gbuild/daily_build_scripts/gbuild.sh Tue Nov 25 11:59:22 2008
@@ -42,6 +42,7 @@
 MVN_HOME=/usr/local/maven
 JAVA_HOME=/usr/local/java
 JRE_HOME=$JAVA_HOME/jre
+SUN_JAVA_HOME=/usr/local/java
 MAVEN_OPTS="-XX:MaxPermSize=256m -Xms512m -Xmx1024m"
 
 CONFIG_FILE=$1
@@ -58,6 +59,7 @@
 export MAVEN_OPTS
 export JAVA_HOME
 export JRE_HOME
+export SUN_JAVA_HOME
 
 export PATH=$JRE_HOME/bin:$JAVA_HOME/bin:$MVN_HOME/bin:$PATH
 

Modified: geronimo/gbuild/daily_build_scripts/tck.sh
URL: http://svn.apache.org/viewvc/geronimo/gbuild/daily_build_scripts/tck.sh?rev=720579&r1=720578&r2=720579&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/tck.sh (original)
+++ geronimo/gbuild/daily_build_scripts/tck.sh Tue Nov 25 11:59:22 2008
@@ -27,7 +27,7 @@
 fi
 
 # TCK must run with Sun JDK
-export JAVA_HOME=/usr/local/java
+export JAVA_HOME=$SUN_JAVA_HOME
 export JRE_HOME=$JAVA_HOME/jre
 export PATH=$JRE_HOME/bin:$JAVA_HOME/bin:$MVN_HOME/bin:$PATH
 export MAVEN_OPTS="-XX:MaxPermSize=128m -Xms512m -Xmx1024m"

Modified: geronimo/gbuild/daily_build_scripts/testsuite.sh
URL: http://svn.apache.org/viewvc/geronimo/gbuild/daily_build_scripts/testsuite.sh?rev=720579&r1=720578&r2=720579&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/testsuite.sh (original)
+++ geronimo/gbuild/daily_build_scripts/testsuite.sh Tue Nov 25 11:59:22 2008
@@ -27,7 +27,7 @@
 fi
 
 # for now have to run testsuites with Sun JDK
-export JAVA_HOME=/usr/local/java
+export JAVA_HOME=$SUN_JAVA_HOME
 export JRE_HOME=$JAVA_HOME/jre
 export FIREFOX_HOME=/usr/local/firefox
 export PATH=$JRE_HOME/bin:$JAVA_HOME/bin:$MVN_HOME/bin:$PATH:/usr/X11R6/bin:$FIREFOX_HOME

Modified: geronimo/gbuild/daily_build_scripts/trunk16.cfg
URL: http://svn.apache.org/viewvc/geronimo/gbuild/daily_build_scripts/trunk16.cfg?rev=720579&r1=720578&r2=720579&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/trunk16.cfg (original)
+++ geronimo/gbuild/daily_build_scripts/trunk16.cfg Tue Nov 25 11:59:22 2008
@@ -1,5 +1,6 @@
-JAVA_HOME=/usr/lib/jvm/jdk1.6.0_10/
-JRE_HOME=/usr/lib/jvm/jdk1.6.0_10/jre/
+JAVA_HOME=/usr/lib/jvm/jdk1.6.0_10
+JRE_HOME=/usr/lib/jvm/jdk1.6.0_10/jre
+SUN_JAVA_HOME=/usr/lib/jvm/jdk1.6.0_10
 
 BRANCH=trunk
 BRANCH_ID=2.2



Mime
View raw message