[jbossnative-commits] JBoss Native SVN: r1669 - sandbox/httpd.

Author: jfrederic.clere(a)jboss.com Date: 2008-06-09 03:57:43 -0400 (Mon, 09 Jun 2008) New Revision: 1669 Modified: sandbox/httpd/httpd.test Log: Arrange the logic of mod_cluster (proxy) building. Modified: sandbox/httpd/httpd.test =================================================================== --- sandbox/httpd/httpd.test 2008-06-06 13:17:38 UTC (rev 1668) +++ sandbox/httpd/httpd.test 2008-06-09 07:57:43 UTC (rev 1669) @@ -12,11 +12,12 @@ # $Id$ PROF=$HOME/httpd.test.`uname -n` -if [ -f $PROF ] -then +if [ -f $PROF ]; then . $PROF fi -. $HOME/.profile +if [ -f $HOME/.profile ]; then + . $HOME/.profile +fi TMPLOC=TMP/`uname -n` mkdir -p $TMPLOC @@ -37,6 +38,22 @@ svn checkout http://svn.apache.org/repos/asf/tomcat/connectors/trunk/jk jk-trunk svn checkout http://anonsvn.jboss.org/repos/jbossnative/trunk/mod_cluster mod_cluster +# +# 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 +(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 + grep proxy_cluster_objs httpd-2.2.x/modules/proxy/config.m4 2&>1 + if [ $? -eq 0 ]; then + echo "httpd-2.2.x/modules/proxy/config.m4 already patches" + else + (cd httpd-2.2.x/modules/proxy + patch -p0 < patch.txt + ) + fi +) + # build APR/APR-UTIL (cd apr-trunk ./buildconf @@ -135,16 +152,18 @@ fi # Build the mod_cluster modules with httpd-2.2.x -(cd $HOME/$TMPLOC/mod_cluster/native/mod_proxy_cluster -./buildconf -./configure --with-apache=$HOME/$TMPLOC/APACHE-2.2.x -make clean -make -) -if [ $? -ne 0 ]; then - echo "Build mod_cluster/native/mod_proxy_cluster FAILED" - exit 1 -fi + +#(cd $HOME/$TMPLOC/mod_cluster/native/mod_proxy_cluster +#./buildconf +#./configure --with-apache=$HOME/$TMPLOC/APACHE-2.2.x +#make clean +#make +#) +#if [ $? -ne 0 ]; then +# echo "Build mod_cluster/native/mod_proxy_cluster FAILED" +# exit 1 +#fi + (cd $HOME/$TMPLOC/mod_cluster/native/mod_manager ./buildconf ./configure --with-apache=$HOME/$TMPLOC/APACHE-2.2.x