Author: jfrederic.clere(a)jboss.com
Date: 2008-06-05 18:28:44 -0400 (Thu, 05 Jun 2008)
New Revision: 1666
Modified:
sandbox/httpd/httpd.test
Log:
Use buildconf instead buildconf.sh and arrange working directory changes.
Modified: sandbox/httpd/httpd.test
===================================================================
--- sandbox/httpd/httpd.test 2008-06-05 19:53:02 UTC (rev 1665)
+++ sandbox/httpd/httpd.test 2008-06-05 22:28:44 UTC (rev 1666)
@@ -29,7 +29,7 @@
fi
# Build it.
-(cd $TMPLOC
+(cd $HOME/$TMPLOC
svn checkout
http://svn.apache.org/repos/asf/apr/apr/trunk/ apr-trunk
svn checkout
http://svn.apache.org/repos/asf/apr/apr-util/trunk/ apr-util-trunk
svn checkout
http://svn.apache.org/repos/asf/httpd/httpd/trunk httpd-trunk
@@ -133,16 +133,11 @@
if [ $? -ne 0 ]; then
exit 1
fi
-)
-if [ $? -ne 0 ]; then
- echo "Build FAILED"
- exit 1
-fi
# Build the mod_cluster modules with httpd-2.2.x
-(cd mod_cluster/native/mod_proxy_cluster
-./buildconf.sh
-./configure --with-apxs=$HOME/$TMPLOC/APACHE-2.2.x/bin/apxs
+(cd $HOME/$TMPLOC/mod_cluster/native/mod_proxy_cluster
+./buildconf
+./configure --with-apache=$HOME/$TMPLOC/APACHE-2.2.x
make clean
make
)
@@ -150,9 +145,9 @@
echo "Build mod_cluster/native/mod_proxy_cluster FAILED"
exit 1
fi
-(cd mod_cluster/native/mod_manager
-./buildconf.sh
-./configure --with-apxs=$HOME/$TMPLOC/APACHE-2.2.x/bin/apxs
+(cd $HOME/$TMPLOC/mod_cluster/native/mod_manager
+./buildconf
+./configure --with-apache=$HOME/$TMPLOC/APACHE-2.2.x
make clean
make
)
@@ -160,9 +155,9 @@
echo "Build mod_cluster/native/mod_manager FAILED"
exit 1
fi
-(cd mod_cluster/native/mod_slotmem
-./buildconf.sh
-./configure --with-apxs=$HOME/$TMPLOC/APACHE-2.2.x/bin/apxs
+(cd $HOME/$TMPLOC/mod_cluster/native/mod_slotmem
+./buildconf
+./configure --with-apache=$HOME/$TMPLOC/APACHE-2.2.x
make clean
make
)
@@ -170,6 +165,11 @@
echo "Build mod_cluster/native/mod_slotmem FAILED"
exit 1
fi
+)
+if [ $? -ne 0 ]; then
+ echo "Build FAILED"
+ exit 1
+fi
# Test trunk
(cd $HOME/$TMPLOC/APACHE