Author: jfrederic.clere(a)jboss.com
Date: 2014-01-28 07:26:12 -0500 (Tue, 28 Jan 2014)
New Revision: 3215
Modified:
trunk/build/unix/build.sh
trunk/build/unix/buildsrc.mod_cluster.sh
trunk/build/unix/package.list
Log:
Add pcre (which isn't any more in httpd-2.4.x
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2014-01-28 08:59:52 UTC (rev 3214)
+++ trunk/build/unix/build.sh 2014-01-28 12:26:12 UTC (rev 3215)
@@ -60,6 +60,7 @@
has_iconv=false
has_expat=false
has_cluster=false
+has_pcre=false
build_apr=false
build_api=false
@@ -246,11 +247,21 @@
has_cluster=true
cluster_sversion="cluster:$cluster_type:$cluster_version"
export cluster_version
+ ;;
+ pcre:*)
+ pcre_version=`echo "${arg}" | ${awk} -F':' '{print
$3}'`
+ pcre_type=`echo "${arg}" | ${awk} -F':' '{print $2}'`
+ has_pcre=true
+ pcre_sversion="pcre:$pcre_type:$pcre_version"
+ ;;
esac
fi
done
export has_apr
export has_apu
+export has_iconv
+export has_libz
+export has_pcre
# Get plaform information
so_extension=so
@@ -1264,6 +1275,7 @@
ZLIBURLBACK=http://cvs.devel.redhat.com/repo/dist/zlib/zlib-${zlib_versio...
#ZLIBURLBACK=http://garr.dl.sourceforge.net/project/libpng/zlib/${zlib_version}/zlib-${zlib_version}.tar.gz
ICONVURL=http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${iconv_version}.ta...
+PCREURL=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${pcre_version}.tar.gz
EXPATURL=http://heanet.dl.sourceforge.net/sourceforge/expat/expat-${expat...
export APIURL
export APIURLBACK
@@ -1276,6 +1288,12 @@
if $has_zlib; then
checkdownload zlib ${zlib_version} $ZLIBURL $ZLIBURLBACK
fi
+if $has_pcre; then
+ checkdownload pcre ${pcre_version} $PCREURL $PCREURLBACK
+fi
+if $has_iconv; then
+ checkdownload iconv ${iconv_version} $ICONVURL $ICONVURLBACK
+fi
# Note: type of the download (r: rhel, v: internet, t: tag in svn).
if $has_openssl; then
if [ "${ssl_type}" = "v" ]; then
Modified: trunk/build/unix/buildsrc.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-28 08:59:52 UTC (rev 3214)
+++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-28 12:26:12 UTC (rev 3215)
@@ -71,10 +71,24 @@
util/ckeckdownload.sh $build_cache_dir $dirsources $build_top
apr-iconv-${api_version} $APIURL $APIURLBACK false
mv $dirsources/srclib/apr-iconv-${api_version} $dirsources/srclib/apr-iconv
fi
- rm -rf ${dirsources}/srclib/zlib
- zlibdirsources=`ls ${native_dist}/srclib/ | grep zlib-`
- echo "Replacing ${dirsources}/srclib/zlib by
${native_dist}/srclib/${zlibdirsources}"
- cp -rp ${native_dist}/srclib/${zlibdirsources} ${dirsources}/srclib/zlib
+ if $has_zlib; then
+ rm -rf ${dirsources}/srclib/zlib
+ zlibdirsources=`ls ${native_dist}/srclib/ | grep zlib-`
+ echo "Replacing ${dirsources}/srclib/zlib by
${native_dist}/srclib/${zlibdirsources}"
+ cp -rp ${native_dist}/srclib/${zlibdirsources} ${dirsources}/srclib/zlib
+ fi
+ if $has_pcre; then
+ rm -rf ${dirsources}/srclib/pcre
+ pcredirsources=`ls ${native_dist}/srclib/ | grep pcre-`
+ echo "Replacing ${dirsources}/srclib/pcre by
${native_dist}/srclib/${pcredirsources}"
+ cp -rp ${native_dist}/srclib/${pcredirsources} ${dirsources}/srclib/pcre
+ fi
+ if $has_iconv; then
+ rm -rf ${dirsources}/srclib/iconv
+ iconvdirsources=`ls ${native_dist}/srclib/ | grep iconv-`
+ echo "Replacing ${dirsources}/srclib/iconv by
${native_dist}/srclib/${iconvdirsources}"
+ cp -rp ${native_dist}/srclib/${iconvdirsources} ${dirsources}/srclib/iconv
+ fi
fi
# Add mod_jk sources.
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2014-01-28 08:59:52 UTC (rev 3214)
+++ trunk/build/unix/package.list 2014-01-28 12:26:12 UTC (rev 3215)
@@ -67,7 +67,7 @@
mod_cluster|1.2.4.Final|2.2.21|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.30|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.2.4.Final
mod_cluster|1.2.5.dev|2.2.21|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.30|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.2.x
mod_cluster|1.2.6.Final|2.2.21|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.30|icon...
-mod_cluster|1.3.0.Alpha2|2.4.7|apr:v:1.5.0|apu:v:1.5.3|api:v:1.2.1|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.37|iconv:v:1.14|expat:v:1.95.8|cluster:t:master
+mod_cluster|1.3.0.Alpha2|2.4.7|apr:v:1.5.0|apu:v:1.5.3|api:v:1.2.1|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.37|iconv:v:1.14|expat:v:1.95.8|pcre:8.34|cluster:t:master
traffic_server|TS_Trunk|trunk
TC7|TC7_Trunk|trunk
TC6|TC6_Trunk|trunk