January 2014 - jbossnative-commits

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-24 08:09:32 -0500 (Fri, 24 Jan 2014) New Revision: 3179 Modified: trunk/build/unix/buildsrc.mod_cluster.sh Log: another typo. Modified: trunk/build/unix/buildsrc.mod_cluster.sh =================================================================== --- trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-24 12:51:36 UTC (rev 3178) +++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-24 13:09:32 UTC (rev 3179) @@ -60,7 +60,7 @@ fi if $has_apu; then util/ckeckdownload.sh $build_cache_dir $dirsources $build_top apr-util-${apu_version} $APUURL $APUURLBACK false - mv $dirsources/srclib/apr-util-${apr_version} $dirsources/srclib/apr-util + mv $dirsources/srclib/apr-util-${apu_version} $dirsources/srclib/apr-util fi # On windows add zlib

10 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-24 07:51:36 -0500 (Fri, 24 Jan 2014) New Revision: 3178 Modified: trunk/build/unix/buildsrc.mod_cluster.sh Log: typo. Modified: trunk/build/unix/buildsrc.mod_cluster.sh =================================================================== --- trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-24 11:44:23 UTC (rev 3177) +++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-24 12:51:36 UTC (rev 3178) @@ -59,7 +59,7 @@ mv $dirsources/srclib/apr-${apr_version} $dirsources/srclib/apr fi if $has_apu; then - util/ckeckdownload.sh $build_cache_dir $dirsources $build_top apr-util-${apu_version} $APIURL $APIURLBACK false + util/ckeckdownload.sh $build_cache_dir $dirsources $build_top apr-util-${apu_version} $APUURL $APUURLBACK false mv $dirsources/srclib/apr-util-${apr_version} $dirsources/srclib/apr-util fi

10 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-24 06:44:23 -0500 (Fri, 24 Jan 2014) New Revision: 3177 Modified: trunk/build/unix/buildsrc.mod_cluster.sh Log: ckeckdownload.sh puts the stuff it downlaods in srclib. Modified: trunk/build/unix/buildsrc.mod_cluster.sh =================================================================== --- trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-24 11:02:00 UTC (rev 3176) +++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-24 11:44:23 UTC (rev 3177) @@ -55,11 +55,11 @@ # Add apr and apr-util if $has_apr; then - util/ckeckdownload.sh $build_cache_dir $dirsources/srclib $build_top apr-${apr_version} $APRURL $APRURLBACK false + util/ckeckdownload.sh $build_cache_dir $dirsources $build_top apr-${apr_version} $APRURL $APRURLBACK false mv $dirsources/srclib/apr-${apr_version} $dirsources/srclib/apr fi if $has_apu; then - util/ckeckdownload.sh $build_cache_dir $dirsources/srclib $build_top apr-util-${apu_version} $APIURL $APIURLBACK false + util/ckeckdownload.sh $build_cache_dir $dirsources $build_top apr-util-${apu_version} $APIURL $APIURLBACK false mv $dirsources/srclib/apr-util-${apr_version} $dirsources/srclib/apr-util fi

10 years, 11 months

1
0
0 / 0

JBoss Native SVN: r3176 - in trunk/build/unix: util and 1 other directory.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-24 06:02:00 -0500 (Fri, 24 Jan 2014) New Revision: 3176 Modified: trunk/build/unix/buildsrc.mod_cluster.sh trunk/build/unix/util/ckeckdownload.sh Log: Another + traces. Modified: trunk/build/unix/buildsrc.mod_cluster.sh =================================================================== --- trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-24 08:57:55 UTC (rev 3175) +++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-24 11:02:00 UTC (rev 3176) @@ -56,11 +56,11 @@ # Add apr and apr-util if $has_apr; then util/ckeckdownload.sh $build_cache_dir $dirsources/srclib $build_top apr-${apr_version} $APRURL $APRURLBACK false - mv $dirsources/srclib/apr-${apr-version} $dirsources/srclib/apr + mv $dirsources/srclib/apr-${apr_version} $dirsources/srclib/apr fi if $has_apu; then util/ckeckdownload.sh $build_cache_dir $dirsources/srclib $build_top apr-util-${apu_version} $APIURL $APIURLBACK false - mv $dirsources/srclib/apr-util-${apr-version} $dirsources/srclib/apr-util + mv $dirsources/srclib/apr-util-${apr_version} $dirsources/srclib/apr-util fi # On windows add zlib Modified: trunk/build/unix/util/ckeckdownload.sh =================================================================== --- trunk/build/unix/util/ckeckdownload.sh 2014-01-24 08:57:55 UTC (rev 3175) +++ trunk/build/unix/util/ckeckdownload.sh 2014-01-24 11:02:00 UTC (rev 3176) @@ -74,6 +74,7 @@ $build_top/util/applypatch.sh $build_top $src_dir false fi fi + echo "Copying ${src_dir} to ${package_src_dir}/srclib" cp -rp ${src_dir} ${package_src_dir}/srclib cd $build_top }

10 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-24 03:57:55 -0500 (Fri, 24 Jan 2014) New Revision: 3175 Modified: trunk/build/unix/buildsrc.cluster.sh Log: arrange extension. Modified: trunk/build/unix/buildsrc.cluster.sh =================================================================== --- trunk/build/unix/buildsrc.cluster.sh 2014-01-23 21:14:34 UTC (rev 3174) +++ trunk/build/unix/buildsrc.cluster.sh 2014-01-24 08:57:55 UTC (rev 3175) @@ -119,7 +119,7 @@ configm4patch=config.m4.patch ;; 2.4*) - configm4patch=config.m4.patch.2.4 + configm4patch=config.m4.2.4.patch ;; esac (cd ${destdir}/modules/proxy

10 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-23 16:14:34 -0500 (Thu, 23 Jan 2014) New Revision: 3174 Modified: trunk/build/unix/buildsrc.cluster.sh Log: typo. Modified: trunk/build/unix/buildsrc.cluster.sh =================================================================== --- trunk/build/unix/buildsrc.cluster.sh 2014-01-23 20:34:30 UTC (rev 3173) +++ trunk/build/unix/buildsrc.cluster.sh 2014-01-23 21:14:34 UTC (rev 3174) @@ -122,7 +122,6 @@ configm4patch=config.m4.patch.2.4 ;; esac -if (cd ${destdir}/modules/proxy $patch -p0 < ${configm4patch} )

10 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-23 15:34:30 -0500 (Thu, 23 Jan 2014) New Revision: 3173 Modified: trunk/build/unix/buildsrc.mod_cluster.sh Log: Oops typo. Modified: trunk/build/unix/buildsrc.mod_cluster.sh =================================================================== --- trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-23 11:02:15 UTC (rev 3172) +++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-23 20:34:30 UTC (rev 3173) @@ -54,11 +54,11 @@ dirsources=${native_dist}/srclib/${dirsources} # Add apr and apr-util -if [ $has_apr ]; then +if $has_apr; then util/ckeckdownload.sh $build_cache_dir $dirsources/srclib $build_top apr-${apr_version} $APRURL $APRURLBACK false mv $dirsources/srclib/apr-${apr-version} $dirsources/srclib/apr fi -if [ $has_apu ]; then +if $has_apu; then util/ckeckdownload.sh $build_cache_dir $dirsources/srclib $build_top apr-util-${apu_version} $APIURL $APIURLBACK false mv $dirsources/srclib/apr-util-${apr-version} $dirsources/srclib/apr-util fi

10 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-23 06:02:15 -0500 (Thu, 23 Jan 2014) New Revision: 3172 Modified: trunk/build/unix/build.sh trunk/build/unix/buildsrc.mod_cluster.sh Log: download apr and apr-util for httpd-2.4.x Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2014-01-23 09:46:28 UTC (rev 3171) +++ trunk/build/unix/build.sh 2014-01-23 11:02:15 UTC (rev 3172) @@ -248,6 +248,8 @@ esac fi done +export has_apr +export has_apu # Get plaform information so_extension=so @@ -1244,6 +1246,10 @@ APUURLBACK=http://archive.apache.org/dist/apr/apr-util-${apu_version}.tar.gz APIURLBACK=http://archive.apache.org/dist/apr/apr-iconv-${api_version}.ta... fi +export APRURL +export APRURL +export APRURLBACK +export APRURLBACK SSLURL=http://www.openssl.org/source/openssl-${ssl_version}.tar.gz SSLURLBACK=ftp://mirror.switch.ch/mirror/openssl/source/openssl-${ssl_version}.tar.gz ZLIBURL=http://www.zlib.net/zlib-${zlib_version}.tar.gz Modified: trunk/build/unix/buildsrc.mod_cluster.sh =================================================================== --- trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-23 09:46:28 UTC (rev 3171) +++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-23 11:02:15 UTC (rev 3172) @@ -53,6 +53,16 @@ dirsources=`ls ${native_dist}/srclib/ | grep httpd-` dirsources=${native_dist}/srclib/${dirsources} +# Add apr and apr-util +if [ $has_apr ]; then + util/ckeckdownload.sh $build_cache_dir $dirsources/srclib $build_top apr-${apr_version} $APRURL $APRURLBACK false + mv $dirsources/srclib/apr-${apr-version} $dirsources/srclib/apr +fi +if [ $has_apu ]; then + util/ckeckdownload.sh $build_cache_dir $dirsources/srclib $build_top apr-util-${apu_version} $APIURL $APIURLBACK false + mv $dirsources/srclib/apr-util-${apr-version} $dirsources/srclib/apr-util +fi + # On windows add zlib if [ "${BUILD_SYS}" = "windows" ]; then rm -rf ${dirsources}/srclib/zlib

10 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

10 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-23 04:03:17 -0500 (Thu, 23 Jan 2014) New Revision: 3170 Modified: trunk/build/unix/buildsrc.cluster.sh trunk/build/unix/buildsrc.mod_cluster.sh Log: Arrange config.m4 patches (2.4 != 2.2). Modified: trunk/build/unix/buildsrc.cluster.sh =================================================================== --- trunk/build/unix/buildsrc.cluster.sh 2014-01-23 07:53:06 UTC (rev 3169) +++ trunk/build/unix/buildsrc.cluster.sh 2014-01-23 09:03:17 UTC (rev 3170) @@ -28,6 +28,7 @@ echo "Tag : $1" echo "Target : $2" echo "Destdir : $3" +echo "HttpVer : $4" echo "" # parameters @@ -37,6 +38,7 @@ tag=$1 dist=$2 destdir=$3 +httpd_version=$4 # we need something like: # http://anonsvn.jboss.org/repos/mod_cluster/trunk/ @@ -112,6 +114,15 @@ cp -p $package_src_dir/srclib/mod_cluster/native/mod_proxy_cluster/*.patch ${destdir}/modules/proxy # Fix the config.m4 to build mod_cluster +case ${httpd_version} in + 2.2*) + configm4patch=config.m4.patch + ;; + 2.4*) + configm4patch=config.m4.patch.2.4 + ;; +esac +if (cd ${destdir}/modules/proxy - $patch -p0 < config.m4.patch + $patch -p0 < ${configm4patch} ) Modified: trunk/build/unix/buildsrc.mod_cluster.sh =================================================================== --- trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-23 07:53:06 UTC (rev 3169) +++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-23 09:03:17 UTC (rev 3170) @@ -63,7 +63,7 @@ # Add mod_jk sources. if $has_jk; then - ${build_top}/util/override.sh ${build_top}/buildsrc.asf-jk.sh ${jk_version} ${package_src_dir} ${dirsources} + ${build_top}/util/override.sh ${build_top}/buildsrc.asf-jk.sh ${jk_version} ${package_src_dir} ${dirsources} ${httpd_version} if [ $? -ne 0 ]; then echo "buildsrc.asf-jk.sh failed" exit 1 @@ -74,7 +74,7 @@ # # Add mod_cluster sources. if $has_cluster; then - ${build_top}/util/override.sh ${build_top}/buildsrc.cluster.sh ${cluster_version} ${package_src_dir} ${dirsources} + ${build_top}/util/override.sh ${build_top}/buildsrc.cluster.sh ${cluster_version} ${package_src_dir} ${dirsources} ${httpd_version} if [ $? -ne 0 ]; then echo "buildsrc.cluster.sh failed" exit 1

10 years, 11 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 January 2014