[jbossnative-commits] JBoss Native SVN: r3104 - trunk/build/unix.
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-13 05:59:33 -0400 (Thu, 13 Jun 2013)
New Revision: 3104
Modified:
trunk/build/unix/buildbin.mod_cluster.sh
Log:
Arrange HPUX logic.
Modified: trunk/build/unix/buildbin.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.sh 2013-06-13 09:25:36 UTC (rev 3103)
+++ trunk/build/unix/buildbin.mod_cluster.sh 2013-06-13 09:59:33 UTC (rev 3104)
@@ -226,11 +226,29 @@
fi
# Add default mod_cluster conf in httpd.conf
+echo "Add default mod_cluster conf in httpd.conf for $build_version"
case $build_version in
1.0.*)
+ echo "skipped!"
;;
1.1.*|1.2.*)
+ if [ "$BUILD_SYS" = "hpux" ]; then
+ echo "Add the mod_cluster modules now because with can't use buildconf on
hpux"
cat >> "${RPM_BUILD_ROOT}/opt/jboss/httpd/httpd/conf/httpd.conf"
<<EOF
+
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
+LoadModule proxy_http_module modules/mod_proxy_http.so
+
+LoadModule proxy_cluster_module modules/mod_proxy_cluster.so
+
+LoadModule manager_module modules/mod_manager.so
+LoadModule slotmem_module modules/mod_slotmem.so
+LoadModule advertise_module modules/mod_advertise.so
+
+EOF
+ fi
+ cat >> "${RPM_BUILD_ROOT}/opt/jboss/httpd/httpd/conf/httpd.conf"
<<EOF
# MOD_CLUSTER_ADDS
# Adjust to you hostname and subnet.
<IfModule manager_module>
@@ -261,6 +279,7 @@
</VirtualHost>
</IfModule>
EOF
+ echo "Done"
;;
esac
@@ -311,7 +330,7 @@
ant build
)
javac *Advertize.java
- cp -p output/classes/*Advertize.class ${RPM_BUILD_ROOT}/${BASEHTTPD}/tools
+ cp -p *Advertize.class ${RPM_BUILD_ROOT}/${BASEHTTPD}/tools
cp -p output/classes/testhttpd.war ${RPM_BUILD_ROOT}/${BASEHTTPD}/tools
) || exit 1
@@ -328,6 +347,7 @@
# Build the *.so for any httpd-2.2.x using the httpd install done before
if [ "${BUILD_SYS}" != "windows" ]; then
+ echo "Building mod_cluster modules with apxs"
BASELOC=`(cd ../mod_cluster/test/java; ant base | grep echo | sed
's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g')`
for dir in `echo mod_manager advertise mod_slotmem mod_proxy_cluster`
do
@@ -341,6 +361,8 @@
do
nfile=`echo $file | sed 's:\.sl:\.so:'`
cp -p $file ../../target/$nfile
+ echo "Copying $file to
${RPM_BUILD_ROOT}/${BASEHTTPD}/lib/httpd/modules"
+ cp -p $file ${RPM_BUILD_ROOT}/${BASEHTTPD}/lib/httpd/modules
done
else
cp *.so ../../target