Author: jfrederic.clere(a)jboss.com Date: 2009-07-09 10:11:49 -0400 (Thu, 09 Jul 2009) New Revision: 2479 Modified: trunk/build/unix/buildbin.mod_cluster.sh trunk/build/unix/buildtest.mod_cluster.sh trunk/mod_cluster/test/java/installhttpd.sh Log: Windoze needs the spaces.... Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2009-07-08 13:32:07 UTC (rev 2478) +++ trunk/build/unix/buildbin.mod_cluster.sh 2009-07-09 14:11:49 UTC (rev 2479) @@ -233,7 +233,11 @@ # Install httpd using the ant script in mod_cluster (cd ../mod_cluster/test/java - BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` + if [ "${BUILD_SYS}" = "windows" ]; then + BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::'` + else + BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` + fi echo "Running: ant installhttpd -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=${output_loc} -Dbase.apache=${BASELOC}" ant installhttpd -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=${output_loc} -Dbase.apache=${BASELOC} ) Modified: trunk/build/unix/buildtest.mod_cluster.sh =================================================================== --- trunk/build/unix/buildtest.mod_cluster.sh 2009-07-08 13:32:07 UTC (rev 2478) +++ trunk/build/unix/buildtest.mod_cluster.sh 2009-07-09 14:11:49 UTC (rev 2479) @@ -55,7 +55,11 @@ esac mod_cluster_jar=../../target/mod-cluster-${mod_cluster_jar}.jar (cd $anttestsdir - BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` + if [ "${BUILD_SYS}" = "windows" ]; then + BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::'` + else + BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` + fi echo "Running ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster_jar} -Dbase.apache=${BASELOC}" ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster_jar} -Dbase.apache=${BASELOC} ) || exit 1 Modified: trunk/mod_cluster/test/java/installhttpd.sh =================================================================== --- trunk/mod_cluster/test/java/installhttpd.sh 2009-07-08 13:32:07 UTC (rev 2478) +++ trunk/mod_cluster/test/java/installhttpd.sh 2009-07-09 14:11:49 UTC (rev 2479) @@ -139,7 +139,11 @@ # TARBALL=http://hudson.qa.jboss.com/hudson/view/Native/job/${BASE}/lastSuc... -BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` +if [ "x${BUILD_SYS}" = "xwindows" ]; then + BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::'` +else + BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` +fi REMOVE=true if [ "x${BASELOC}" = "x" ]