[jbossnative-commits] JBoss Native SVN: r2571 - sandbox/httpd.
Author: jfrederic.clere(a)jboss.com
Date: 2009-09-29 03:47:41 -0400 (Tue, 29 Sep 2009)
New Revision: 2571
Modified:
sandbox/httpd/httpd.test
Log:
Arrange the builds.
Modified: sandbox/httpd/httpd.test
===================================================================
--- sandbox/httpd/httpd.test 2009-09-25 15:32:59 UTC (rev 2570)
+++ sandbox/httpd/httpd.test 2009-09-29 07:47:41 UTC (rev 2571)
@@ -44,7 +44,8 @@
#
# Copy the mod_cluster code into httpd-2.2.x/modules/proxy
-# That is a hack until we have a provider of ping/pong in ajp/http...etc logics
+# Now the ping/pong in ajp is in mod_proxy_cluster (http still missing).
+# That is just to test the build in httpd-2.2.x sources.
(cd $HOME/$TMPLOC
cp mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c httpd-2.2.x/modules/proxy
cp mod_cluster/native/mod_proxy_cluster/patch.txt httpd-2.2.x/modules/proxy
@@ -68,25 +69,37 @@
make install
)
if [ $? -ne 0 ]; then
+ echo "Can't build apr-trunk"
exit 1
fi
-(cd apr-util-trunk
-./buildconf --with-apr=$HOME/$TMPLOC/apr-trunk
-./configure --prefix=$HOME/$TMPLOC/APU --with-apr=$HOME/$TMPLOC/APR $APUADDCONF
+(cd apr-1.3.x
+./buildconf
+./configure --prefix=$HOME/$TMPLOC/APR-1.3.x
make clean
make
make install
)
if [ $? -ne 0 ]; then
+ echo "Can't build apr-1.3.x"
exit 1
fi
+(cd apr-util-1.3.x
+./buildconf --with-apr=$HOME/$TMPLOC/apr-1.3.x
+./configure --prefix=$HOME/$TMPLOC/APU-1.3.x --with-apr=$HOME/$TMPLOC/APR-1.3.x
$APUADDCONF
+make clean
+make
+make install
+)
+if [ $? -ne 0 ]; then
+ exit 1
+fi
# build HTTPD trunk
(cd httpd-trunk
-./buildconf --with-apr=$HOME/$TMPLOC/apr-trunk
--with-apr-util=$HOME/$TMPLOC/apr-util-trunk
+./buildconf --with-apr=$HOME/$TMPLOC/apr-1.3.x
--with-apr-util=$HOME/$TMPLOC/apr-util-1.3.x
./configure --prefix=$HOME/$TMPLOC/APACHE \
- --with-apr=$HOME/$TMPLOC/APR \
- --with-apr-util=$HOME/$TMPLOC/APU \
+ --with-apr=$HOME/$TMPLOC/APR-1.3.x \
+ --with-apr-util=$HOME/$TMPLOC/APU-1.3.x \
--enable-maintainer-mode \
--enable-mods-shared=most \
--with-ssl=$SSL_LOC \
@@ -112,34 +125,12 @@
exit 1
fi
-# build APR/APR-UTIL 1.3.x
-(cd apr-1.3.x
-./buildconf
-./configure --prefix=$HOME/$TMPLOC/APR-1.3.x
-make clean
-make
-make install
-)
-if [ $? -ne 0 ]; then
- exit 1
-fi
-(cd apr-util-1.3.x
-./buildconf --with-apr=$HOME/$TMPLOC/apr-1.3.x
-./configure --prefix=$HOME/$TMPLOC/APU-1.3.x --with-apr=$HOME/$TMPLOC/APR-1.3.x
$APUADDCONF
-make clean
-make
-make install
-)
-if [ $? -ne 0 ]; then
- exit 1
-fi
-
# Build httpd 2.2.x
(cd httpd-2.2.x
-./buildconf --with-apr=$HOME/$TMPLOC/apr-trunk
--with-apr-util=$HOME/$TMPLOC/apr-util-trunk
+./buildconf --with-apr=$HOME/$TMPLOC/apr-1.3.x
--with-apr-util=$HOME/$TMPLOC/apr-util-1.3.x
./configure --prefix=$HOME/$TMPLOC/APACHE-2.2.x \
- --with-apr=$HOME/$TMPLOC/APR \
- --with-apr-util=$HOME/$TMPLOC/APU \
+ --with-apr=$HOME/$TMPLOC/APR-1.3.x \
+ --with-apr-util=$HOME/$TMPLOC/APU-1.3.x \
--enable-maintainer-mode \
--enable-mods-shared=most \
--with-ssl=$SSL_LOC \