geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r599174 - in /geronimo/gbuild/daily_build_scripts: 2.0.cfg gbuild.sh trunk.cfg
Date Wed, 28 Nov 2007 22:40:20 GMT
Author: gawor
Date: Wed Nov 28 14:40:19 2007
New Revision: 599174

URL: http://svn.apache.org/viewvc?rev=599174&view=rev
Log:
let config override some properties

Modified:
    geronimo/gbuild/daily_build_scripts/2.0.cfg
    geronimo/gbuild/daily_build_scripts/gbuild.sh
    geronimo/gbuild/daily_build_scripts/trunk.cfg

Modified: geronimo/gbuild/daily_build_scripts/2.0.cfg
URL: http://svn.apache.org/viewvc/geronimo/gbuild/daily_build_scripts/2.0.cfg?rev=599174&r1=599173&r2=599174&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/2.0.cfg (original)
+++ geronimo/gbuild/daily_build_scripts/2.0.cfg Wed Nov 28 14:40:19 2007
@@ -3,3 +3,4 @@
 BRANCH_DIR=2.0
 TCK_BRANCH=2.0
 BUILD_OPENEJB=false
+SCRIPT_DIR=/home/prasad/bin/daily_build_scripts

Modified: geronimo/gbuild/daily_build_scripts/gbuild.sh
URL: http://svn.apache.org/viewvc/geronimo/gbuild/daily_build_scripts/gbuild.sh?rev=599174&r1=599173&r2=599174&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/gbuild.sh (original)
+++ geronimo/gbuild/daily_build_scripts/gbuild.sh Wed Nov 28 14:40:19 2007
@@ -27,6 +27,12 @@
 TCK_BRANCH=none
 BUILD_OPENEJB=false
 
+BASE_DIR=/home/prasad
+TEST_DIR=$BASE_DIR/geronimo
+SCRIPT_DIR=$BASE_DIR/bin
+M2_REPO=$BASE_DIR/.m2/repository
+ADMIN_ADDR=prasad@apache.org,gawor@apache.org
+
 CONFIG_FILE=$1
 SKIP_TESTS=$2
 
@@ -43,11 +49,6 @@
 export PATH=$JRE_HOME/bin:$JAVA_HOME/bin:$MVN_HOME/bin:$PATH
 export MAVEN_OPTS="-XX:MaxPermSize=256m -Xms512m -Xmx1024m"
 
-BASE_DIR=/home/prasad
-TEST_DIR=$BASE_DIR/geronimo
-M2_REPO=$BASE_DIR/.m2/repository
-ADMIN_ADDR=prasad@apache.org,gawor@apache.org
-
 echo `date` > $BASE_DIR/date.log
 
 # check if another gbuild script is still running
@@ -152,7 +153,7 @@
    
    if [ "$SKIP_TESTS" = "false" ]
    then
-     . /home/prasad/bin/testsuite.sh ${BRANCH_ID} ${BRANCH_DIR}
+     . $SCRIPT_DIR/testsuite.sh ${BRANCH_ID} ${BRANCH_DIR}
 
      grep -E "BUILD ERROR|FAILURE!|Failed to start Geronimo server" $testLog
      if [ $? -eq 0 ]
@@ -164,7 +165,7 @@
 
    mail_results $result
 
-   . /home/prasad/bin/tck.sh ${TCK_BRANCH}
+   . $SCRIPT_DIR/tck.sh ${TCK_BRANCH}
 
 else
   tail -100 $log >> mail.txt

Modified: geronimo/gbuild/daily_build_scripts/trunk.cfg
URL: http://svn.apache.org/viewvc/geronimo/gbuild/daily_build_scripts/trunk.cfg?rev=599174&r1=599173&r2=599174&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/trunk.cfg (original)
+++ geronimo/gbuild/daily_build_scripts/trunk.cfg Wed Nov 28 14:40:19 2007
@@ -3,3 +3,4 @@
 BRANCH_DIR=trunk
 TCK_BRANCH=2.1
 BUILD_OPENEJB=true
+SCRIPT_DIR=/home/prasad/bin/daily_build_scripts



Mime
View raw message