You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/07/22 23:29:23 UTC
svn commit: r678914 - in /geronimo/gbuild/daily_build_scripts: 2.0.cfg
gbuild.sh tck.sh testsuite.sh
Author: gawor
Date: Tue Jul 22 14:29:23 2008
New Revision: 678914
URL: http://svn.apache.org/viewvc?rev=678914&view=rev
Log:
allow JAVA_HOME, MVH_HOME to be specified in the test configuration
Modified:
geronimo/gbuild/daily_build_scripts/2.0.cfg
geronimo/gbuild/daily_build_scripts/gbuild.sh
geronimo/gbuild/daily_build_scripts/tck.sh
geronimo/gbuild/daily_build_scripts/testsuite.sh
Modified: geronimo/gbuild/daily_build_scripts/2.0.cfg
URL: http://svn.apache.org/viewvc/geronimo/gbuild/daily_build_scripts/2.0.cfg?rev=678914&r1=678913&r2=678914&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/2.0.cfg (original)
+++ geronimo/gbuild/daily_build_scripts/2.0.cfg Tue Jul 22 14:29:23 2008
@@ -1,3 +1,5 @@
+MVN_HOME=/usr/local/maven-2.0.7
+
BRANCH=branches/2.0
BRANCH_ID=2.0.3
BRANCH_DIR=2.0
Modified: geronimo/gbuild/daily_build_scripts/gbuild.sh
URL: http://svn.apache.org/viewvc/geronimo/gbuild/daily_build_scripts/gbuild.sh?rev=678914&r1=678913&r2=678914&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/gbuild.sh (original)
+++ geronimo/gbuild/daily_build_scripts/gbuild.sh Tue Jul 22 14:29:23 2008
@@ -41,7 +41,7 @@
MVN_HOME=/usr/local/maven
JAVA_HOME=/usr/local/java
-JRE_HOME=/usr/lib/jvm/jre
+JRE_HOME=$JAVA_HOME/jre
MAVEN_OPTS="-XX:MaxPermSize=256m -Xms512m -Xmx1024m"
CONFIG_FILE=$1
Modified: geronimo/gbuild/daily_build_scripts/tck.sh
URL: http://svn.apache.org/viewvc/geronimo/gbuild/daily_build_scripts/tck.sh?rev=678914&r1=678913&r2=678914&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/tck.sh (original)
+++ geronimo/gbuild/daily_build_scripts/tck.sh Tue Jul 22 14:29:23 2008
@@ -21,9 +21,17 @@
# -----------------------------------------------------------------------------
-export MVN_HOME=/usr/local/maven
-export JAVA_HOME=/usr/local/java
-export JRE_HOME=/usr/lib/jvm/jre
+if [ -n "$MVN_HOME" ]
+then
+ export MVN_HOME=/usr/local/maven
+fi
+
+if [ -n "$JAVA_HOME" ]
+then
+ export JAVA_HOME=/usr/local/java
+ export JRE_HOME=$JAVA_HOME/jre
+fi
+
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=678914&r1=678913&r2=678914&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/testsuite.sh (original)
+++ geronimo/gbuild/daily_build_scripts/testsuite.sh Tue Jul 22 14:29:23 2008
@@ -21,9 +21,17 @@
# -----------------------------------------------------------------------------
-export MVN_HOME=/usr/local/maven
-export JAVA_HOME=/usr/local/java
-export JRE_HOME=/usr/lib/jvm/jre
+if [ -n "$MVN_HOME" ]
+then
+ export MVN_HOME=/usr/local/maven
+fi
+
+if [ -n "$JAVA_HOME" ]
+then
+ export JAVA_HOME=/usr/local/java
+ export JRE_HOME=$JAVA_HOME/jre
+fi
+
export FIREFOX_HOME=/usr/local/firefox
export PATH=$JRE_HOME/bin:$JAVA_HOME/bin:$MVN_HOME/bin:$PATH:/usr/X11R6/bin:$FIREFOX_HOME
export MAVEN_OPTS="-XX:MaxPermSize=128m -Xms512m -Xmx1024m"