March 2014 - jbossnative-commits - Jboss List Archives

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-03-16 13:25:06 -0400 (Sun, 16 Mar 2014) New Revision: 3269 Modified: trunk/build/unix/build.sh Log: empty environment variable = bad. Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2014-03-14 10:08:33 UTC (rev 3268) +++ trunk/build/unix/build.sh 2014-03-16 17:25:06 UTC (rev 3269) @@ -1289,7 +1289,7 @@ checkdownload zlib ${zlib_version} $ZLIBURL $ZLIBURLBACK fi if $has_pcre; then - checkdownload pcre ${pcre_version} $PCREURL $PCREURLBACK + checkdownload pcre ${pcre_version} $PCREURL "NONE" fi if $has_iconv; then checkdownload iconv ${iconv_version} $ICONVURL $ICONVURLBACK

10 years, 6 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

10 years, 6 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

10 years, 6 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-03-07 09:32:22 -0500 (Fri, 07 Mar 2014) New Revision: 3266 Modified: trunk/build/unix/buildsrc.cluster.sh Log: restore logic to build 1.2.6.org :D Modified: trunk/build/unix/buildsrc.cluster.sh =================================================================== --- trunk/build/unix/buildsrc.cluster.sh 2014-03-07 14:08:29 UTC (rev 3265) +++ trunk/build/unix/buildsrc.cluster.sh 2014-03-07 14:32:22 UTC (rev 3266) @@ -49,6 +49,9 @@ master) URLBASE=http://github.com/modcluster/mod_cluster/tarball/master ;; + *.org) + URLBASE=http://github.com/jfclere/mod_cluster/tarball/${tag} + ;; *) URLBASE=http://github.com/modcluster/mod_cluster/tarball/${tag} #URLBASE=http://github.com/jfclere/mod_cluster/tarball/${tag}

10 years, 6 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-03-07 09:08:29 -0500 (Fri, 07 Mar 2014) New Revision: 3265 Modified: trunk/build/unix/buildsrc.asf-jk.sh Log: Try the 2 locations and then the test (Mladen) one. Modified: trunk/build/unix/buildsrc.asf-jk.sh =================================================================== --- trunk/build/unix/buildsrc.asf-jk.sh 2014-03-07 10:02:19 UTC (rev 3264) +++ trunk/build/unix/buildsrc.asf-jk.sh 2014-03-07 14:08:29 UTC (rev 3265) @@ -42,8 +42,8 @@ # http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.... #URLBASE=http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-$1/tomcat-connectors-$1-src URLBASE=http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat... -#URLBASEBACK=http://ftp.heanet.ie/mirrors/www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-$1/tomcat-connectors-$1-src -URLBASEBACK=http://people.apache.org/~mturk/tomcat-connectors/jk-$1/tomcat-connectors-$1-src +URLBASEBACK=http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-$1/tomcat-connectors-$1-src +URLBASETEST=http://people.apache.org/~mturk/tomcat-connectors/jk-$1/tomcat-connectors-$1-src case $BUILD_SYS in windows) URL=${URLBASE}.zip @@ -57,7 +57,10 @@ util/ckeckdownload.sh $build_cache_dir $package_src_dir $build_top tomcat-connectors-${native_tag}-src $URL $URLBACK if [ $? -ne 0 ]; then - exit 1 + util/ckeckdownload.sh $build_cache_dir $package_src_dir $build_top tomcat-connectors-${native_tag}-src $URLBASETEST "NONE" + if [ $? -ne 0 ]; then + exit 1 + fi fi #

10 years, 6 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

10 years, 6 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-03-04 10:44:14 -0500 (Tue, 04 Mar 2014) New Revision: 3263 Modified: trunk/build/unix/buildsrc.cluster.sh Log: typo :-( Modified: trunk/build/unix/buildsrc.cluster.sh =================================================================== --- trunk/build/unix/buildsrc.cluster.sh 2014-03-04 15:43:21 UTC (rev 3262) +++ trunk/build/unix/buildsrc.cluster.sh 2014-03-04 15:44:14 UTC (rev 3263) @@ -109,7 +109,7 @@ cp -p $package_src_dir/srclib/mod_cluster/native/mod_cluster_slotmem/* ${destdir}/modules/mod_cluster_slotmem else mkdir -p ${destdir}/modules/mod_slotmem - cp -p $package_src_dir/srclib/mod_cluster/native/mod_slotmem/* ${destdir}/modules/mod__slotmem + cp -p $package_src_dir/srclib/mod_cluster/native/mod_slotmem/* ${destdir}/modules/mod_slotmem fi cp -p $package_src_dir/srclib/mod_cluster/native/advertise/* ${destdir}/modules/advertise cp -p $package_src_dir/srclib/mod_cluster/native/mod_manager/* ${destdir}/modules/mod_manager

10 years, 6 months

1
0
0 / 0

JBoss Native SVN: r3262 - trunk/httpd/httpd-2.2/modules.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-03-04 10:43:21 -0500 (Tue, 04 Mar 2014) New Revision: 3262 Removed: trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/ Log: remove mod_cluster_slotmem which is for 1.3.x

10 years, 6 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-03-04 09:49:38 -0500 (Tue, 04 Mar 2014) New Revision: 3261 Modified: trunk/build/unix/buildsrc.cluster.sh Log: Adjust another mod_slotmem/mod_cluster_slotmem problem. Modified: trunk/build/unix/buildsrc.cluster.sh =================================================================== --- trunk/build/unix/buildsrc.cluster.sh 2014-03-04 14:01:48 UTC (rev 3260) +++ trunk/build/unix/buildsrc.cluster.sh 2014-03-04 14:49:38 UTC (rev 3261) @@ -104,10 +104,15 @@ # Copy the files to httpd src. mkdir -p ${destdir}/modules/advertise mkdir -p ${destdir}/modules/mod_manager -mkdir -p ${destdir}/modules/mod_cluster_slotmem +if [ -d $package_src_dir/srclib/mod_cluster/native/mod_cluster_slotmem ]; then + mkdir -p ${destdir}/modules/mod_cluster_slotmem + cp -p $package_src_dir/srclib/mod_cluster/native/mod_cluster_slotmem/* ${destdir}/modules/mod_cluster_slotmem +else + mkdir -p ${destdir}/modules/mod_slotmem + cp -p $package_src_dir/srclib/mod_cluster/native/mod_slotmem/* ${destdir}/modules/mod__slotmem +fi cp -p $package_src_dir/srclib/mod_cluster/native/advertise/* ${destdir}/modules/advertise cp -p $package_src_dir/srclib/mod_cluster/native/mod_manager/* ${destdir}/modules/mod_manager -cp -p $package_src_dir/srclib/mod_cluster/native/mod_cluster_slotmem/* ${destdir}/modules/mod_cluster_slotmem cp -p $package_src_dir/srclib/mod_cluster/native/include/* ${destdir}/modules/proxy cp -p $package_src_dir/srclib/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c ${destdir}/modules/proxy

10 years, 6 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-03-04 09:01:48 -0500 (Tue, 04 Mar 2014) New Revision: 3260 Modified: trunk/build/unix/buildbin.mod_cluster.sh trunk/build/unix/buildbin.mod_cluster.windows.sh Log: Adjust the name of mod_cluster_slotmem and mod_slotmem. Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2014-03-04 12:21:50 UTC (rev 3259) +++ trunk/build/unix/buildbin.mod_cluster.sh 2014-03-04 14:01:48 UTC (rev 3260) @@ -135,7 +135,16 @@ fi if $has_cluster; then - add_conf="$add_conf --enable-proxy-cluster --enable-advertise --enable-cluster-slotmem --enable-manager --disable-proxy-balancer" + case $build_version in + 1.0.*|1.1.*|1.2.*) + add_conf="$add_conf --enable-proxy-cluster --enable-advertise --enable--slotmem --enable-manager --disable-proxy-balancer" + slotmem=slotmem + ;; + 1.3.*) + add_conf="$add_conf --enable-proxy-cluster --enable-advertise --enable-cluster-slotmem --enable-manager --disable-proxy-balancer" + slotmem=cluster_slotmem + ;; + esac fi # Ajust some more platform dependent stuff. @@ -233,7 +242,7 @@ ;; 1.1.*|1.2.*|1.3.*) if [ "$BUILD_SYS" = "hpux" ]; then - echo "Add the mod_cluster modules now because with can't use buildconf on hpux" + echo "Add the mod_cluster modules now because we can't use buildconf on hpux" cat >> "${RPM_BUILD_ROOT}/opt/jboss/httpd/httpd/conf/httpd.conf" <<EOF LoadModule proxy_module /opt/jboss/httpd/lib/httpd/modules/mod_proxy.so @@ -243,7 +252,7 @@ LoadModule proxy_cluster_module /opt/jboss/httpd/lib/httpd/modules/mod_proxy_cluster.so LoadModule manager_module /opt/jboss/httpd/lib/httpd/modules/mod_manager.so -LoadModule cluster_slotmem_module /opt/jboss/httpd/lib/httpd/modules/mod_cluster_slotmem.so +LoadModule ${slotmem}_module /opt/jboss/httpd/lib/httpd/modules/mod_${slotmem}.so LoadModule advertise_module /opt/jboss/httpd/lib/httpd/modules/mod_advertise.so EOF @@ -392,7 +401,7 @@ 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_cluster_slotmem mod_proxy_cluster` + for dir in `echo mod_manager advertise mod_${slotmem} mod_proxy_cluster` do (cd ../mod_cluster/native/$dir sh buildconf Modified: trunk/build/unix/buildbin.mod_cluster.windows.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.windows.sh 2014-03-04 12:21:50 UTC (rev 3259) +++ trunk/build/unix/buildbin.mod_cluster.windows.sh 2014-03-04 14:01:48 UTC (rev 3260) @@ -115,6 +115,14 @@ # Add default mod_cluster conf in httpd.conf case $build_version in + 1.0.*|1.1.*|1.2.*) + slotmem=slotmem + ;; + 1.3.*) + slotmem=cluster_slotmem + ;; +esac +case $build_version in 1.0.*) ;; 1.1.*|1.2.*|1.3.*) @@ -129,7 +137,7 @@ LoadModule proxy_cluster_module modules/mod_proxy_cluster.so LoadModule manager_module modules/mod_manager.so -LoadModule cluster_slotmem_module modules/mod_cluster_slotmem.so +LoadModule ${slotmem}_module modules/mod_${slotmem}.so LoadModule advertise_module modules/mod_advertise.so # MOD_CLUSTER_ADDS @@ -173,7 +181,7 @@ LoadModule proxy_cluster_module modules/mod_proxy_cluster.so LoadModule manager_module modules/mod_manager.so -LoadModule cluster_slotmem_module modules/mod_cluster_slotmem.so +LoadModule ${slotmem}_module modules/mod_${slotmem}.so LoadModule advertise_module modules/mod_advertise.so # MOD_CLUSTER_ADDS

10 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossnative-commits March 2014