jbossnative-commits May 2010

jbossnative-commits@lists.jboss.org

1 participants
25 discussions

JBoss Native SVN: r2664 - trunk/build/patch.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2010-05-05 04:20:50 -0400 (Wed, 05 May 2010) New Revision: 2664 Modified: trunk/build/patch/httpd-2.2.15.patch Log: Add a patch for libtool 2.2.6 Modified: trunk/build/patch/httpd-2.2.15.patch =================================================================== --- trunk/build/patch/httpd-2.2.15.patch 2010-05-04 16:26:40 UTC (rev 2663) +++ trunk/build/patch/httpd-2.2.15.patch 2010-05-05 08:20:50 UTC (rev 2664) @@ -40,3 +40,123 @@ !IF EXIST($(SRCDIR)\file_io\win32\buffer.c) OBJECTS = $(OBJECTS) \ +--- srclib/apr-util/buildconf (original) ++++ srclib/apr-util/buildconf Thu Nov 12 23:20:30 2009 +@@ -17,6 +17,11 @@ + # + # + ++if [ "$1" = "--verbose" -o "$1" = "-v" ]; then ++ verbose="--verbose" ++ shift ++fi ++ + # Default place to look for apr source. Can be overridden with + # --with-apr=[directory] + apr_src_dir=../apr +@@ -67,11 +72,11 @@ + # Generate the autoconf header (include/apu_config.h) and ./configure + # + echo "Creating include/private/apu_config.h ..." +-${AUTOHEADER:-autoheader} ++${AUTOHEADER:-autoheader} $verbose + + echo "Creating configure ..." + ### do some work to toss config.cache? +-if ${AUTOCONF:-autoconf}; then ++if ${AUTOCONF:-autoconf} $verbose; then + : + else + echo "autoconf failed" +@@ -82,14 +87,14 @@ + # Generate build-outputs.mk for the build system + # + echo "Generating 'make' outputs ..." +-$apr_src_dir/build/gen-build.py make ++$apr_src_dir/build/gen-build.py $verbose make + + # + # If Expat has been bundled, then go and configure the thing + # + if [ -f xml/expat/buildconf.sh ]; then + echo "Invoking xml/expat/buildconf.sh ..." +- (cd xml/expat; ./buildconf.sh) ++ (cd xml/expat; ./buildconf.sh $verbose) + fi + + # Remove autoconf cache again + +--- srclib/apr-util/xml/expat/buildconf.sh (original) ++++ srclib/apr-util/xml/expat/buildconf.sh Thu Nov 12 23:20:30 2009 +@@ -1,5 +1,10 @@ + #! /bin/sh + ++if [ "$1" = "--verbose" -o "$1" = "-v" ]; then ++ verbose="--verbose" ++ shift ++fi ++ + # + # Find libtoolize + # +@@ -25,7 +30,7 @@ + (cd conftools ; rm -f ltconfig ltmain.sh) + rm -rf aclocal.m4 libtool.m4 ltsugar.m4 autom4te*.cache + +-$libtoolize --copy --automake ++$libtoolize --copy --automake --force $verbose + + # + # Build aclocal.m4 from libtool's libtool.m4 +@@ -42,12 +47,12 @@ + cat $ltfile >> aclocal.m4 + + if [ -f ltsugar.m4 ]; then +- echo "Incorporating ltsugar.m4 into aclocal.m4 ..." +- cat ltsugar.m4 >> aclocal.m4 ++ rm -f conftools/ltsugar.m4 ++ mv ltsugar.m4 conftools/ltsugar.m4 + fi + +-# Clean up again +-rm -f libtool.m4 ltsugar.m4 ++# Clean up any leftovers ++rm -f aclocal.m4 libtool.m4 + + cross_compile_warning="warning: AC_TRY_RUN called without default to allow cross compiling" + +@@ -55,11 +60,11 @@ + # Generate the autoconf header template (config.h.in) and ./configure + # + echo "Creating config.h.in ..." +-${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning" ++${AUTOHEADER:-autoheader} $verbose 2>&1 | grep -v "$cross_compile_warning" + + echo "Creating configure ..." + ### do some work to toss config.cache? +-${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning" ++${AUTOCONF:-autoconf} $verbose 2>&1 | grep -v "$cross_compile_warning" + + # Remove autoconf caches + rm -rf autom4te*.cache + +--- srclib/apr-util/xml/expat/configure.in (original) ++++ srclib/apr-util/xml/expat/configure.in Thu Nov 12 23:20:30 2009 +@@ -12,6 +12,14 @@ + + AC_INIT(Makefile.in) + AC_CONFIG_AUX_DIR(conftools) ++AC_CONFIG_MACRO_DIR(conftools) ++ ++sinclude(conftools/libtool.m4) ++sinclude(conftools/ltsugar.m4) ++sinclude(conftools/argz.m4) ++sinclude(conftools/ltoptions.m4) ++sinclude(conftools/ltversion.m4) ++sinclude(conftools/lt~obsolete.m4) + + dnl + dnl Follow the GNU/Linux convention of odd number minor version for + + +

14 years

1
0
0 / 0

JBoss Native SVN: r2663 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2010-05-04 12:26:40 -0400 (Tue, 04 May 2010) New Revision: 2663 Modified: trunk/build/unix/buildbin.mod_cluster.sh Log: MODCLUSTER-150 Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2010-05-04 10:04:50 UTC (rev 2662) +++ trunk/build/unix/buildbin.mod_cluster.sh 2010-05-04 16:26:40 UTC (rev 2663) @@ -225,6 +225,68 @@ done fi +# Add default mod_cluster conf in httpd.conf +cat >> "${RPM_BUILD_ROOT}/opt/jboss/httpd/httpd/conf/httpd.conf" <<EOF +# MOD_CLUSTER_ADDS +# Adjust to you hostname and subnet. +<IfModule manager_module> + Listen 127.0.0.1:6666 + ManagerBalancerName mycluster + <VirtualHost 127.0.0.1:6666> + <Directory /> + Order deny,allow + Deny from all + Allow from 127.0.0 + </Directory> + + KeepAliveTimeout 300 + MaxKeepAliveRequests 0 + #ServerAdvertise on http://@IP@:6666 + AdvertiseFrequency 5 + #AdvertiseSecurityKey secret + #AdvertiseGroup @ADVIP@:23364 + + <Location /mod_cluster_manager> + SetHandler mod_cluster-manager + Order deny,allow + Deny from all + Allow from 127.0.0 + </Location> + + </VirtualHost> +</IfModule> +EOF + +# Arrange pathes so that the stuff can run in ~ +if [ "${BUILD_SYS}" != "windows" ]; then + BASEHTTPD=/opt/jboss/httpd/ + HTTPDCONF=httpd/conf + HTTPDSBIN=sbin + HTTPDBUILD=htdocs/build + files="${HTTPDSBIN}/apachectl ${HTTPDCONF}/httpd.conf ${HTTPDSBIN}/envvars ${HTTPDSBIN}/apxs ${HTTPDBUILD}/config_vars.mk" + for FILE in `echo $files` + do + file=${RPM_BUILD_ROOT}/${BASEHTTPD}/$FILE + echo "$file" + cp -p $file $file.new + sed "s:${BASEHTTPD}::" $file > $file.new + mv $file.new $file + done + # Arrange apachectl + file=$RPM_BUILD_ROOT/${BASEHTTPD}/${BASEHTTPDSBIN}/apachectl + cp -p $file $file.new + echo "s:\$HTTPD -k \$ARGV:\$HTTPD -k \$ARGV -d httpd:" > sed.cmd + sed -f sed.cmd $file > $file.new + mv $file.new $file + + # Arrange httpd.conf (ServerRoot) + file=$RPM_BUILD_ROOT/${BASEHTTPD}/${HTTPDCONF}/httpd.conf + cp -p $file $file.new + echo "s:ServerRoot \".*:ServerRoot \".\":" > sed.cmd + sed -f sed.cmd $file > $file.new + mv $file.new $file +fi + # Also build the java part. (cd ../mod_cluster mvn -P dist package -Djboss.server.log.dir=`pwd` -Djava.net.preferIPv4Stack=true

14 years

1
0
0 / 0

JBoss Native SVN: r2662 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

14 years

1
0
0 / 0

JBoss Native SVN: r2661 - trunk/build/daemon.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2010-05-02 05:13:06 -0400 (Sun, 02 May 2010) New Revision: 2661 Added: trunk/build/daemon/buildTC7.sh Log: Add TC7 tests. Added: trunk/build/daemon/buildTC7.sh =================================================================== --- trunk/build/daemon/buildTC7.sh (rev 0) +++ trunk/build/daemon/buildTC7.sh 2010-05-02 09:13:06 UTC (rev 2661) @@ -0,0 +1,53 @@ +#!/bin/sh +# Copyright(c) 2010 Red Hat Middleware, LLC, +# and individual contributors as indicated by the @authors tag. +# See the copyright.txt in the distribution for a +# full listing of individual contributors. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library in the file COPYING.LIB; +# if not, write to the Free Software Foundation, Inc., +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA +# +# @author Jean-Frederic Clere +# +echo "" +echo "Running `basename $0` $LastChangedDate: 2008-07-23 16:17:15 +0200 (Wed, 23 Jul 2008) $" +echo "" +echo "Started : `date`" +echo "Params : $@" +echo "" + +build_ssl=true + +while [ "x" != "x$1" ] +do + case $1 in + -env) + echo "Dumping environment" + env + echo "" + ;; + -no-ssl) + build_ssl=false + ;; + esac + shift +done + +(cd ../unix + if $build_ssl; then + ./build.sh TC7 -ssl -cache -test + fi + ./build.sh TC7 -cache -test +) Property changes on: trunk/build/daemon/buildTC7.sh ___________________________________________________________________ Name: svn:executable + *

14 years

1
0
0 / 0

JBoss Native SVN: r2660 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2010-05-02 05:04:38 -0400 (Sun, 02 May 2010) New Revision: 2660 Added: trunk/build/unix/buildbin.TC7.sh trunk/build/unix/buildsrc.TC7.sh trunk/build/unix/buildtest.TC7.sh Modified: trunk/build/unix/package.list Log: Add TC7 tests. Added: trunk/build/unix/buildbin.TC7.sh =================================================================== --- trunk/build/unix/buildbin.TC7.sh (rev 0) +++ trunk/build/unix/buildbin.TC7.sh 2010-05-02 09:04:38 UTC (rev 2660) @@ -0,0 +1,58 @@ +#!/bin/sh +# Copyright(c) 2010 Red Hat Middleware, LLC, +# and individual contributors as indicated by the @authors tag. +# See the copyright.txt in the distribution for a +# full listing of individual contributors. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library in the file COPYING.LIB; +# if not, write to the Free Software Foundation, Inc., +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA +# +# @author Jean-Frederic Clere +# +echo "" +echo "Running : `basename $0` $LastChangedDate: 2009-07-09 18:37:49 +0200 (Thu, 09 Jul 2009) $" +echo "" +echo "Started : `date`" +echo "Common : $1" +echo "Prefix : $2" +echo "Output : $3" +echo "OpenSSL : $4" +echo "Static : $5" +echo "Sources : $6" +echo "" + + +# parameters +# $1: Location of the common libraries. +# $2: Destination location. +# $3: Location where to put the binaries. +# $4: Use OpenSSL. +# $5: Use static build. +# $6: Location of the sources. + +common_loc=$1 +prefix_loc=$2 +output_loc=$3 +has_openssl_loc=$4 +has_static_loc=$5 +sources_loc=$6 +current_loc=`pwd` + +native_sources=srclib/`ls srclib | grep TC7` +cd $native_sources +ant || exit 1 +ant test || exit 1 +echo "Done" +exit 0 Property changes on: trunk/build/unix/buildbin.TC7.sh ___________________________________________________________________ Name: svn:executable + * Added: trunk/build/unix/buildsrc.TC7.sh =================================================================== --- trunk/build/unix/buildsrc.TC7.sh (rev 0) +++ trunk/build/unix/buildsrc.TC7.sh 2010-05-02 09:04:38 UTC (rev 2660) @@ -0,0 +1,65 @@ +#!/bin/sh +# Copyright(c) 2010 Red Hat Middleware, LLC, +# and individual contributors as indicated by the @authors tag. +# See the copyright.txt in the distribution for a +# full listing of individual contributors. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library in the file COPYING.LIB; +# if not, write to the Free Software Foundation, Inc., +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA +# +# @author Jean-Frederic Clere +# +echo "" +echo "Running : `basename $0` $LastChangedDate: 2009-10-27 08:23:43 +0100 (Tue, 27 Oct 2009) $" +echo "" +echo "Started : `date`" +echo "Tag : $1" +echo "Target : $2" +echo "" + +# parameters +# $1: The tag to use something like 2.2.6 or trunk +# $2: Directory where to put the sources. + +tag=$1 +dist=$2 + +# we need something like: +# http://anonsvn.jboss.org/repos/mod_cluster/trunk/ +case $tag in + trunk) + URLBASE=http://svn.apache.org/repos/asf/tomcat/trunk + ;; + branches/*) + URLBASE=http://svn.apache.org/repos/asf/tomcat/tc7.0.x/branches/${tag} + ;; + *) + URLBASE=http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/${tag} + ;; +esac + +echo "$tag using $URLBASE" +(cd $package_src_dir/srclib +svn export ${URLBASE} TC7 +) +if [ $? -ne 0 ]; then + echo "svn co ${URLBASE} TC7 FAILED" + exit 1 +fi +if [ ! -d $package_src_dir/srclib/TC7 ]; then + echo "$package_src_dir/srclib/TC7 not found!" + echo "svn co ${URLBASE} TC7 FAILED" + exit 1 +fi Property changes on: trunk/build/unix/buildsrc.TC7.sh ___________________________________________________________________ Name: svn:executable + * Added: trunk/build/unix/buildtest.TC7.sh =================================================================== --- trunk/build/unix/buildtest.TC7.sh (rev 0) +++ trunk/build/unix/buildtest.TC7.sh 2010-05-02 09:04:38 UTC (rev 2660) @@ -0,0 +1,52 @@ +#!/bin/sh +# Copyright(c) 2010 Red Hat Middleware, LLC, +# and individual contributors as indicated by the @authors tag. +# See the copyright.txt in the distribution for a +# full listing of individual contributors. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library in the file COPYING.LIB; +# if not, write to the Free Software Foundation, Inc., +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA +# +# @author Jean-Frederic Clere +# +# Run a test of the traffic_server. +# +# $1 : Base directory for the test. +# $2 : Directory where the package was built. +# $3 : Directory where downloaded packages are stored. +# $4 : Name or IP to use for the tests. +# $5 : Do the SSL stuff. + +base=$1 +root=$2 +build_cache_dir=$3 +IPLOCAL=$4 +loc_has_ssl=$5 + +echo "" +echo "Running : `basename $0` $LastChangedDate: 2009-10-29 08:26:17 +0100 (Thu, 29 Oct 2009) $" +echo "" + +(cd ${root} +./bin/startup.sh +sleep 10 +curl -v http://localhost:8080/NOT_FOUND 2>&1 | grep "Apache Tomcat/7" || exit 1 +./bin/shutdown.sh +) || exit 1 + +echo "" +echo "SUCCESS : `basename $0` $LastChangedDate: 2009-10-29 08:26:17 +0100 (Thu, 29 Oct 2009) $" +echo "" +exit 0 Modified: trunk/build/unix/package.list =================================================================== --- trunk/build/unix/package.list 2010-04-14 09:13:39 UTC (rev 2659) +++ trunk/build/unix/package.list 2010-05-02 09:04:38 UTC (rev 2660) @@ -44,3 +44,4 @@ mod_cluster|1.1.0.dev|2.2.15|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.30|iconv:v:1.11|expat:v:1.95.8|cluster:t:trunk mod_cluster|1.0.4.dev|2.2.15|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.30|iconv:v:1.11|expat:v:1.95.8|cluster:t:branches/1.0.x traffic_server|TS_Trunk|trunk +TC7|TC7_Trunk|trunk

14 years

1
0
0 / 0

← Newer
1
2
3
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossnative-commits May 2010