Author: jfrederic.clere(a)jboss.com
Date: 2009-07-07 09:41:55 -0400 (Tue, 07 Jul 2009)
New Revision: 2468
Modified:
trunk/build/unix/buildbin.mod_cluster.sh
Log:
Prevent spaces in base.apache (for example Mac OS X-10.5.7-i386!).
Modified: trunk/build/unix/buildbin.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.sh 2009-07-07 11:59:36 UTC (rev 2467)
+++ trunk/build/unix/buildbin.mod_cluster.sh 2009-07-07 13:41:55 UTC (rev 2468)
@@ -233,6 +233,12 @@
# Install httpd using the ant script in mod_cluster
(cd ../mod_cluster/test/java
+ BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::'`
+ BASELOCNOSPACES=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^
*::' | sed 's:' ':/:g'`
+ if [ "x${BASELOC}" != "x${BASELOCNOSPACES}" ]
+ then
+ BASELOC=${BASELOCNOSPACES}
+ fi
echo "Running: ant installhttpd -DBUILDTEST=Y -Dbuild_version=${build_version}
-Droot=${output_loc}"
ant installhttpd -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=${output_loc}
)
@@ -240,6 +246,11 @@
# Build the *.so for any httpd-2.2.x using the httpd install done before
if [ "${BUILD_SYS}" != "windows" ]; then
BASELOC=`(cd ../mod_cluster/test/java; ant base | grep echo | sed
's:\[echo\]::' | sed 's:^ *::')`
+ BASELOCNOSPACES=`(cd ../mod_cluster/test/java; ant base | grep echo | sed
's:\[echo\]::' | sed 's:^ *::' | sed 's:' ':/:g')`
+ if [ "x${BASELOC}" != "x${BASELOCNOSPACES}" ]
+ then
+ BASELOC=${BASELOCNOSPACES}
+ fi
for dir in `echo mod_proxy mod_manager advertise mod_slotmem mod_proxy_cluster`
do
(cd ../mod_cluster/native/$dir
Show replies by date