JBoss Native SVN: r2470 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-07-07 11:00:54 -0400 (Tue, 07 Jul 2009)
New Revision: 2470
Modified:
trunk/build/unix/buildbin.mod_cluster.sh
Log:
Oops ant installhttpd also needs -Dbase.apache=blabla...
Modified: trunk/build/unix/buildbin.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.sh 2009-07-07 14:14:41 UTC (rev 2469)
+++ trunk/build/unix/buildbin.mod_cluster.sh 2009-07-07 15:00:54 UTC (rev 2470)
@@ -239,8 +239,8 @@
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}
+ 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}
)
# Build the *.so for any httpd-2.2.x using the httpd install done before
15 years, 5 months
JBoss Native SVN: r2469 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-07-07 10:14:41 -0400 (Tue, 07 Jul 2009)
New Revision: 2469
Modified:
trunk/build/unix/buildbin.mod_cluster.sh
trunk/build/unix/buildtest.mod_cluster.sh
Log:
Typos.
Modified: trunk/build/unix/buildbin.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.sh 2009-07-07 13:41:55 UTC (rev 2468)
+++ trunk/build/unix/buildbin.mod_cluster.sh 2009-07-07 14:14:41 UTC (rev 2469)
@@ -234,7 +234,7 @@
# 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'`
+ BASELOCNOSPACES=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'`
if [ "x${BASELOC}" != "x${BASELOCNOSPACES}" ]
then
BASELOC=${BASELOCNOSPACES}
@@ -246,7 +246,7 @@
# 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')`
+ 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}
Modified: trunk/build/unix/buildtest.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildtest.mod_cluster.sh 2009-07-07 13:41:55 UTC (rev 2468)
+++ trunk/build/unix/buildtest.mod_cluster.sh 2009-07-07 14:14:41 UTC (rev 2469)
@@ -57,7 +57,7 @@
echo "Running ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster_jar}"
(cd $anttestsdir
BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::'`
- BASELOCNOSPACES=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's:' ':/:g'`
+ BASELOCNOSPACES=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'`
if [ "x${BASELOC}" != "x${BASELOCNOSPACES}" ]
then
BASELOC=${BASELOCNOSPACES}
15 years, 5 months
JBoss Native SVN: r2468 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
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
15 years, 5 months
JBoss Native SVN: r2467 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-07-07 07:59:36 -0400 (Tue, 07 Jul 2009)
New Revision: 2467
Modified:
trunk/build/unix/buildtest.mod_cluster.sh
Log:
Prevent spaces in base.apache (for example Mac OS X-10.5.7-i386!).
Modified: trunk/build/unix/buildtest.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildtest.mod_cluster.sh 2009-06-08 14:50:02 UTC (rev 2466)
+++ trunk/build/unix/buildtest.mod_cluster.sh 2009-07-07 11:59:36 UTC (rev 2467)
@@ -56,7 +56,13 @@
mod_cluster_jar=../../target/mod-cluster-${mod_cluster_jar}.jar
echo "Running ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster_jar}"
(cd $anttestsdir
- ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster_jar}
+ 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
+ ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster_jar} -Dbase.apache=${BASELOC}
) || exit 1
echo ""
15 years, 5 months