JBoss Native SVN: r2315 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-02-24 02:46:13 -0500 (Tue, 24 Feb 2009)
New Revision: 2315
Modified:
trunk/build/unix/buildtest.mod_cluster.sh
Log:
typo.
Modified: trunk/build/unix/buildtest.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildtest.mod_cluster.sh 2009-02-23 13:20:43 UTC (rev 2314)
+++ trunk/build/unix/buildtest.mod_cluster.sh 2009-02-24 07:46:13 UTC (rev 2315)
@@ -45,7 +45,7 @@
# Exporting stuff to use in install won't work so use -Dbla=bla
# 1.0.0.dev = 1.0.0-SNAPSHOT
# 1.0.0.Beta4 = 1.0.0.Beta4
-case $build_version
+case ${build_version} in
*.dev)
mvn_version=`echo ${build_version} | sed 's:.dev:-SNAPSHOT:'`
;;
15 years, 10 months
JBoss Native SVN: r2314 - in trunk: mod_cluster/test/java and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-02-23 08:20:43 -0500 (Mon, 23 Feb 2009)
New Revision: 2314
Modified:
trunk/build/unix/buildtest.mod_cluster.sh
trunk/mod_cluster/test/java/build.properties.default
trunk/mod_cluster/test/java/build.xml
trunk/mod_cluster/test/java/installhttpd.sh
Log:
In fact it is not possible to export in build.sh (or others) and except to have the variable in a shell started by ant.
Modified: trunk/build/unix/buildtest.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildtest.mod_cluster.sh 2009-02-20 10:15:33 UTC (rev 2313)
+++ trunk/build/unix/buildtest.mod_cluster.sh 2009-02-23 13:20:43 UTC (rev 2314)
@@ -42,11 +42,19 @@
# the stuff is in /home/jfclere/jbossnative/trunk/build/unix/work/mod_cluster-1.0.0.dev-src/srclib/mod_cluster/src/test/java
# $root is /home/jfclere/jbossnative/trunk/build/unix/work/mod_cluster-1.0.0.dev-src/output/linux2-x64
anttestsdir=`cd $root/../../srclib/mod_cluster/test/java; pwd`
-BUILDTEST=Y
-export BUILDTEST
-export root
+# Exporting stuff to use in install won't work so use -Dbla=bla
+# 1.0.0.dev = 1.0.0-SNAPSHOT
+# 1.0.0.Beta4 = 1.0.0.Beta4
+case $build_version
+ *.dev)
+ mvn_version=`echo ${build_version} | sed 's:.dev:-SNAPSHOT:'`
+ ;;
+ *)
+ mvn_version=${build_version}
+ ;;
+esac
(cd $anttestsdir
- ant
+ ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmvn_version=${Dmvn_version}
) || exit 1
echo ""
Modified: trunk/mod_cluster/test/java/build.properties.default
===================================================================
--- trunk/mod_cluster/test/java/build.properties.default 2009-02-20 10:15:33 UTC (rev 2313)
+++ trunk/mod_cluster/test/java/build.properties.default 2009-02-23 13:20:43 UTC (rev 2314)
@@ -1,4 +1,8 @@
test.failonerror=true
+BUILDTEST=N
+build_version=1.0.0.dev
+mvn_version=1.0.0-SNAPSHOT
+root=.
base-apache.loc=http://archive.apache.org/dist/
base.path=${user.home}/java
@@ -42,4 +46,4 @@
jboss-ejb-api.jar.loc=${base-jboss.loc}/jboss-ejb-api/${jboss-ejb-api.version}/jboss-ejb-api-${jboss-ejb-api.version}.jar
jboss-ejb-api.jar=${base.path}/${jboss-ejb-api.version}/jboss-ejb-api-spi-${jboss-ejb-api.version}.jar
-mod_cluster.jar=../../target/mod-cluster-1.0.0-SNAPSHOT.jar
+mod_cluster.jar=../../target/mod-cluster-${mvn_version}.jar
Modified: trunk/mod_cluster/test/java/build.xml
===================================================================
--- trunk/mod_cluster/test/java/build.xml 2009-02-20 10:15:33 UTC (rev 2313)
+++ trunk/mod_cluster/test/java/build.xml 2009-02-23 13:20:43 UTC (rev 2314)
@@ -100,6 +100,12 @@
<mkdir dir="${base.apache}" />
<exec executable="bash">
<arg value="installhttpd.sh"/>
+ <arg value="localhost"/>
+ <arg value="232.0.0.2"/>
+ <arg value="127.0.0.1"/>
+ <arg value="${BUILDTEST}"/>
+ <arg value="${build_version}"/>
+ <arg value="${root}"/>
</exec>
</target>
<target name="httpd" depends="installhttpd">
Modified: trunk/mod_cluster/test/java/installhttpd.sh
===================================================================
--- trunk/mod_cluster/test/java/installhttpd.sh 2009-02-20 10:15:33 UTC (rev 2313)
+++ trunk/mod_cluster/test/java/installhttpd.sh 2009-02-23 13:20:43 UTC (rev 2314)
@@ -4,9 +4,15 @@
# $1: IP address to listen (both for normal requests and cluster management ones.
# $2: IP address for the advertise
# $3: sub network to accept cluster management requests.
+# $4: Use a binaries from a directory.
+# $5: version to build.
+# $6: root to find the binaries.
IP=localhost
ADVIP=232.0.0.2
SUBIP=127.0.0.1
+BUILDTEST=N
+build_version=1.0.0.dev
+root=.
if [ "x$1" != "x" ]
then
IP=$1
@@ -19,6 +25,18 @@
then
SUBIP=$3
fi
+if [ "x$4" != "x" ]
+then
+ BUILDTEST=$4
+fi
+if [ "x$5" != "x" ]
+then
+ build_version=$5
+fi
+if [ "x$6" != "x" ]
+then
+ root=$6
+fi
#
# Set the platform and arch for the download bundles.
@@ -111,14 +129,7 @@
;;
esac
#PACKVER=rhel-httpd-2.2.8-1.el5s2
-if [ "x${PACKAGE}" = "x" ]
-then
- PACKVER=mod_cluster-1.0.0.dev
-else
- # The PACKVER and build_version from the build.sh script.
- echo "Using ${build_version} for ${PACKVER}"
- PACKVER=${PACKAGE}-${build_version}
-fi
+PACKVER=mod_cluster-${build_version}
# Something like (note don't use ssl for the moment.
# http://hudson.qa.jboss.com/hudson/view/Native/job/mod_cluster-linux-x86_6...
@@ -136,7 +147,7 @@
ant downloadfile -Dsourcefile=${TARBALL} -Ddestfile=${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT} -Ddestdir="$BASELOC"
fi
else
- if [ "x${BUILDTEST}" = "x" ]
+ if [ "x${BUILDTEST}" = "N" ]
then
rm -f ${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT}
ant downloadfile -Dsourcefile=${TARBALL} -Ddestfile=${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT} -Ddestdir="$BASELOC"
15 years, 10 months
JBoss Native SVN: r2313 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-02-20 05:15:33 -0500 (Fri, 20 Feb 2009)
New Revision: 2313
Modified:
trunk/build/unix/buildsrc.mod_cluster.sh
Log:
Stop the buid if buildconf failed...
Modified: trunk/build/unix/buildsrc.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildsrc.mod_cluster.sh 2009-02-20 10:06:31 UTC (rev 2312)
+++ trunk/build/unix/buildsrc.mod_cluster.sh 2009-02-20 10:15:33 UTC (rev 2313)
@@ -120,11 +120,11 @@
if [ "${BUILD_SYS}" != "windows" ]; then
(cd ${dirsources}
- bash buildconf
- )
+ bash buildconf || exit 1
+ ) || exit 1
if $has_jk; then
(cd ${dirsources}/modules/jk
- autoconf
- )
+ autoconf || exit 1
+ ) || exit 1
fi
fi
15 years, 10 months
JBoss Native SVN: r2312 - trunk/mod_cluster.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-02-20 05:06:31 -0500 (Fri, 20 Feb 2009)
New Revision: 2312
Modified:
trunk/mod_cluster/README.txt
Log:
Oops python is also needed.
Modified: trunk/mod_cluster/README.txt
===================================================================
--- trunk/mod_cluster/README.txt 2009-02-20 08:40:04 UTC (rev 2311)
+++ trunk/mod_cluster/README.txt 2009-02-20 10:06:31 UTC (rev 2312)
@@ -29,18 +29,21 @@
1.
Native:
-To build the native component you need a C compiler and the following tools:
-m4, perl, autoconf, automake, libtool, make and patch.
-Of course the make and the patch must be gnu ones.
-For example on Solaris you need:
-SMCm4 (requires libsigsegv and libgcc34).
-SMCperl
-SMCautoc
-SMCautom
-SMClibt
-SMCmake
-SMCpatch
-All those can be downloaded from http://www.sunfreeware.com/
+ To build the native component from the sources you need a C compiler and
+ the following tools:
+ m4, perl, autoconf, automake, libtool, make, patch and python.
+ Of course the make and the patch must be gnu ones.
+ For example on Solaris you need:
+ SMCm4 (requires libsigsegv and libgcc34).
+ SMCperl
+ SMCautoc
+ SMCautom
+ SMClibt
+ SMCmake
+ SMCpatch
+ SMCpython
+ All those can be downloaded from http://www.sunfreeware.com/
+
This software is distributed under the terms of the FSF Lesser Gnu
Public License (see lgpl.txt).
15 years, 10 months
JBoss Native SVN: r2311 - trunk/mod_cluster/test/java.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-02-20 03:40:04 -0500 (Fri, 20 Feb 2009)
New Revision: 2311
Modified:
trunk/mod_cluster/test/java/installhttpd.sh
Log:
windoze names contain spaces :-(
Modified: trunk/mod_cluster/test/java/installhttpd.sh
===================================================================
--- trunk/mod_cluster/test/java/installhttpd.sh 2009-02-20 08:08:21 UTC (rev 2310)
+++ trunk/mod_cluster/test/java/installhttpd.sh 2009-02-20 08:40:04 UTC (rev 2311)
@@ -154,7 +154,7 @@
rm -rf "$BASELOC/$BASEHTTPD"
case ${EXT} in
file)
- cp -rp $root/* $BASELOC
+ cp -rp $root/* "$BASELOC"
case $BUILD_TAG in
*windows*)
EXT=zip
15 years, 10 months
JBoss Native SVN: r2310 - trunk/mod_cluster/test/java.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-02-20 03:08:21 -0500 (Fri, 20 Feb 2009)
New Revision: 2310
Modified:
trunk/mod_cluster/test/java/build.properties.default
Log:
Add version otherwise dev12 and dev92 will collide.
Modified: trunk/mod_cluster/test/java/build.properties.default
===================================================================
--- trunk/mod_cluster/test/java/build.properties.default 2009-02-20 07:32:50 UTC (rev 2309)
+++ trunk/mod_cluster/test/java/build.properties.default 2009-02-20 08:08:21 UTC (rev 2310)
@@ -2,7 +2,7 @@
base-apache.loc=http://archive.apache.org/dist/
base.path=${user.home}/java
-base.apache=${user.home}/java/${os.name}-${os.arch}
+base.apache=${user.home}/java/${os.name}-${os.version}-${os.arch}
commons-httpclient.loc=${base-apache.loc}/httpcomponents/commons-httpclient/binary/commons-httpclient-3.1.tar.gz
commons-httpclient.jar=${base.path}/commons-httpclient-3.1/commons-httpclient-3.1.jar
15 years, 10 months
JBoss Native SVN: r2309 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-02-20 02:32:50 -0500 (Fri, 20 Feb 2009)
New Revision: 2309
Modified:
trunk/build/unix/buildbin.mod_cluster.sh
Log:
Use apxs.
Modified: trunk/build/unix/buildbin.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.sh 2009-02-19 17:55:49 UTC (rev 2308)
+++ trunk/build/unix/buildbin.mod_cluster.sh 2009-02-20 07:32:50 UTC (rev 2309)
@@ -232,7 +232,7 @@
do
(cd ../mod_cluster/native/$dir
sh buildconf
- ./configure --with-apache=${BASELOC}/opt/jboss/httpd
+ ./configure --with-apxs=${BASELOC}/opt/jboss/httpd/sbin/apxs
make clean
make
cp *.so ../../target
15 years, 10 months
JBoss Native SVN: r2308 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-02-19 12:55:49 -0500 (Thu, 19 Feb 2009)
New Revision: 2308
Modified:
trunk/build/unix/buildbin.mod_cluster.sh
Log:
Build the so only packages.
Modified: trunk/build/unix/buildbin.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.sh 2009-02-19 17:35:57 UTC (rev 2307)
+++ trunk/build/unix/buildbin.mod_cluster.sh 2009-02-19 17:55:49 UTC (rev 2308)
@@ -225,6 +225,23 @@
cp target/*-bin.* ${build_top}/output
)
+# Build the *.so for any httpd-2.2.x using the httpd install of the previous run
+if [ "${BUILD_SYS}" != "windows" ]; then
+ BASELOC=`(cd ../mod_cluster/test/java; ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::')`
+ for dir in `echo mod_proxy mod_manager advertise mod_slotmem mod_proxy_cluster`
+ do
+ (cd ../mod_cluster/native/$dir
+ sh buildconf
+ ./configure --with-apache=${BASELOC}/opt/jboss/httpd
+ make clean
+ make
+ cp *.so ../../target
+ )
+ done
+ (cd ../mod_cluster/target
+ tar zcf ${build_top}/output/${PACKAGE}-${build_version}-${BUILD_SYS}-${BUILD_CPU}-so.tar.gz *.so
+ )
+fi
echo "Done"
exit 0
15 years, 10 months
JBoss Native SVN: r2307 - trunk/mod_cluster/native/mod_slotmem.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-02-19 12:35:57 -0500 (Thu, 19 Feb 2009)
New Revision: 2307
Modified:
trunk/mod_cluster/native/mod_slotmem/Makefile.in
trunk/mod_cluster/native/mod_slotmem/configure.in
Log:
Use apxs.
Modified: trunk/mod_cluster/native/mod_slotmem/Makefile.in
===================================================================
--- trunk/mod_cluster/native/mod_slotmem/Makefile.in 2009-02-19 17:33:25 UTC (rev 2306)
+++ trunk/mod_cluster/native/mod_slotmem/Makefile.in 2009-02-19 17:35:57 UTC (rev 2307)
@@ -1,19 +1,19 @@
# Makefile.in for mod_proxy_cluster
# copy the source in the httpd Apache source tree
APACHE_BASE = @APACHE_BASE@
-top_builddir = @APACHE_BASE@
+top_builddir = @APACHE_BUILDDIR@
# For .deps.
builddir = @CLUSTER_BASE@
# For the apache includes
top_srcdir = @APACHE_BASE@
-include $(APACHE_BASE)/build/rules.mk
+include $(top_builddir)/build/rules.mk
SH_COMPILE = $(LIBTOOL) --mode=compile $(BASE_CC) -I../include -prefer-pic -c $< && touch $@
all: mod_slotmem.so
mod_slotmem.so: mod_slotmem.la
- $(APACHE_BASE)/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_slotmem.la `pwd`
+ $(top_builddir)/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_slotmem.la `pwd`
mod_slotmem.la: sharedmem_util.slo mod_sharedmem.slo
$(SH_LINK) -rpath $(libexecdir) -module -avoid-version mod_sharedmem.lo sharedmem_util.lo
Modified: trunk/mod_cluster/native/mod_slotmem/configure.in
===================================================================
--- trunk/mod_cluster/native/mod_slotmem/configure.in 2009-02-19 17:33:25 UTC (rev 2306)
+++ trunk/mod_cluster/native/mod_slotmem/configure.in 2009-02-19 17:35:57 UTC (rev 2307)
@@ -4,21 +4,30 @@
AC_INIT(mod_sharedmem.c)
AC_MSG_CHECKING(for Apache httpd installation)
-AC_ARG_WITH(apache,
-[ --with-apache[=DIR] DIR is the apache base installation
+AC_ARG_WITH(apxs,
+[ --with-apxs[=FILE] Build shared Apache module using apxs.
+ FILE is the apache apxs tool
],
-[ if test "$withval" = "yes"; then
- withval=/usr/local/etc/httpd
- fi
+[ apxs_support=true
if test "$withval" != "no"; then
- APACHE_BASE=$withval
+ APXS=$withval
+ AC_MSG_RESULT([APXS is ${APXS}])
+ ${APXS} -q PREFIX >/dev/null 2>/dev/null || apxs_support=false
else
- AC_MSG_ERROR(mod_manager need a valid apache location)
+ apxs_support=false
fi
+ AC_MSG_RESULT([apxs_support is ${apxs_support}])
+ if test "${apxs_support}" = "false" ; then
+ AC_MSG_ERROR(mod_cluster module need a valid apxs)
+ fi
+ APACHE_BASE=`$APXS -q PREFIX`
+ APACHE_BUILDDIR=`$APXS -q installbuilddir`
+ APACHE_BUILDDIR=`(cd $APACHE_BUILDDIR/..; pwd)`
],
-[ AC_MSG_ERROR(Please use --with-apache[=DIR])])
+[ AC_MSG_ERROR(Please use --with-apxs[=FILE])])
CLUSTER_BASE=`pwd`
AC_SUBST(APACHE_BASE)
AC_SUBST(CLUSTER_BASE)
+AC_SUBST(APACHE_BUILDDIR)
AC_OUTPUT(Makefile)
15 years, 10 months
JBoss Native SVN: r2306 - trunk/mod_cluster/native/mod_proxy_cluster.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-02-19 12:33:25 -0500 (Thu, 19 Feb 2009)
New Revision: 2306
Modified:
trunk/mod_cluster/native/mod_proxy_cluster/Makefile.in
trunk/mod_cluster/native/mod_proxy_cluster/configure.in
Log:
Use apxs.
Modified: trunk/mod_cluster/native/mod_proxy_cluster/Makefile.in
===================================================================
--- trunk/mod_cluster/native/mod_proxy_cluster/Makefile.in 2009-02-19 17:30:33 UTC (rev 2305)
+++ trunk/mod_cluster/native/mod_proxy_cluster/Makefile.in 2009-02-19 17:33:25 UTC (rev 2306)
@@ -12,19 +12,19 @@
# limitations under the License.
APACHE_BASE = @APACHE_BASE@
-top_builddir = @APACHE_BASE@
+top_builddir = @APACHE_BUILDDIR@
# For .deps.
builddir = @CLUSTER_BASE@
MOD_OBJS_LO=
-include $(APACHE_BASE)/build/rules.mk
+include $(top_builddir)/build/rules.mk
SH_COMPILE = $(LIBTOOL) --mode=compile $(BASE_CC) -I../include -prefer-pic -c $< && touch $@
all: mod_proxy_cluster.so
mod_proxy_cluster.so: mod_proxy_cluster.la
- $(APACHE_BASE)/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_proxy_cluster.la `pwd`
+ $(top_builddir)/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_proxy_cluster.la `pwd`
mod_proxy_cluster.la: mod_proxy_cluster.slo
$(SH_LINK) -rpath $(libexecdir) -module -avoid-version mod_proxy_cluster.lo $(MOD_OBJS_LO)
Modified: trunk/mod_cluster/native/mod_proxy_cluster/configure.in
===================================================================
--- trunk/mod_cluster/native/mod_proxy_cluster/configure.in 2009-02-19 17:30:33 UTC (rev 2305)
+++ trunk/mod_cluster/native/mod_proxy_cluster/configure.in 2009-02-19 17:33:25 UTC (rev 2306)
@@ -4,21 +4,30 @@
AC_INIT(mod_proxy_cluster.c)
AC_MSG_CHECKING(for Apache httpd installation)
-AC_ARG_WITH(apache,
-[ --with-apache[=DIR] DIR is the apache base installation
+AC_ARG_WITH(apxs,
+[ --with-apxs[=FILE] Build shared Apache module using apxs.
+ FILE is the apache apxs tool
],
-[ if test "$withval" = "yes"; then
- withval=/usr/local/etc/httpd
- fi
+[ apxs_support=true
if test "$withval" != "no"; then
- APACHE_BASE=$withval
+ APXS=$withval
+ AC_MSG_RESULT([APXS is ${APXS}])
+ ${APXS} -q PREFIX >/dev/null 2>/dev/null || apxs_support=false
else
- AC_MSG_ERROR(mod_manager need a valid apache location)
+ apxs_support=false
fi
+ AC_MSG_RESULT([apxs_support is ${apxs_support}])
+ if test "${apxs_support}" = "false" ; then
+ AC_MSG_ERROR(mod_cluster module need a valid apxs)
+ fi
+ APACHE_BASE=`$APXS -q PREFIX`
+ APACHE_BUILDDIR=`$APXS -q installbuilddir`
+ APACHE_BUILDDIR=`(cd $APACHE_BUILDDIR/..; pwd)`
],
-[ AC_MSG_ERROR(Please use --with-apache[=DIR])])
+[ AC_MSG_ERROR(Please use --with-apxs[=FILE])])
CLUSTER_BASE=`pwd`
AC_SUBST(APACHE_BASE)
AC_SUBST(CLUSTER_BASE)
+AC_SUBST(APACHE_BUILDDIR)
AC_OUTPUT(Makefile)
15 years, 10 months