Author: jfrederic.clere(a)jboss.com Date: 2014-01-28 03:52:36 -0500 (Tue, 28 Jan 2014) New Revision: 3213 Modified: trunk/build/unix/buildsrc.mod_cluster.sh trunk/build/unix/package.list Log: Windows needs apr-iconv... Modified: trunk/build/unix/buildsrc.mod_cluster.sh =================================================================== --- trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-28 08:38:02 UTC (rev 3212) +++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-28 08:52:36 UTC (rev 3213) @@ -65,8 +65,12 @@ mv $dirsources/srclib/apr-util-${apu_version} $dirsources/srclib/apr-util fi -# On windows add zlib +# On windows add zlib and apr-iconv if [ "${BUILD_SYS}" = "windows" ]; then + if $has_api; then + 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}" Modified: trunk/build/unix/package.list =================================================================== --- trunk/build/unix/package.list 2014-01-28 08:38:02 UTC (rev 3212) +++ trunk/build/unix/package.list 2014-01-28 08:52:36 UTC (rev 3213) @@ -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|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: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 traffic_server|TS_Trunk|trunk TC7|TC7_Trunk|trunk TC6|TC6_Trunk|trunk