Author: jfrederic.clere(a)jboss.com Date: 2014-08-28 08:08:32 -0400 (Thu, 28 Aug 2014) New Revision: 3359 Modified: trunk/build/unix/build.sh trunk/build/unix/buildbin.mod_cluster.sh trunk/build/unix/buildsrc.mod_cluster.sh trunk/build/unix/package.list Log: Add mod_bmx for unix. Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2014-08-28 11:15:06 UTC (rev 3358) +++ trunk/build/unix/build.sh 2014-08-28 12:08:32 UTC (rev 3359) @@ -61,6 +61,7 @@ has_expat=false has_cluster=false has_pcre=false +has_bmx=false build_apr=false build_api=false @@ -254,6 +255,12 @@ has_pcre=true pcre_sversion="pcre:$pcre_type:$pcre_version" ;; + bmx:*) + bmx_version=`echo "${arg}" | ${awk} -F':' '{print $3}'` + bmx_type=`echo "${arg}" | ${awk} -F':' '{print $2}'` + has_bmx=true + bmx_sversion="bmx:$bmx_type:$bmx_version" + ;; esac fi done @@ -262,6 +269,7 @@ export has_iconv export has_libz export has_pcre +export has_bmx # Get plaform information so_extension=so @@ -1305,6 +1313,7 @@ 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... EXPATURLBACK=http://switch.dl.sourceforge.net/sourceforge/expat/expat-${e... +BMXURL=https://github.com/hyperic/mod_bmx/archive/${bmx-version}.tar.gz export APIURL export APIURLBACK export api_version @@ -1319,6 +1328,9 @@ if $has_pcre; then checkdownload pcre ${pcre_version} $PCREURL "NONE" fi +if $has_bmx; then + checkdownload bmx ${bmx_version} $BMXURL "NONE" +fi if $has_iconv; then checkdownload iconv ${iconv_version} $ICONVURL "NONE" fi Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2014-08-28 11:15:06 UTC (rev 3358) +++ trunk/build/unix/buildbin.mod_cluster.sh 2014-08-28 12:08:32 UTC (rev 3359) @@ -135,7 +135,7 @@ fi if $has_cluster; then - case $build_version in + 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 @@ -144,8 +144,11 @@ add_conf="$add_conf --enable-proxy-cluster --enable-advertise --enable-cluster-slotmem --enable-manager --disable-proxy-balancer" slotmem=cluster_slotmem ;; - esac + esac fi +if $has_bmx; then + add_conf="$add_conf --enable-bmx --enable-bmx-vhost --enable-bmx-status" +fi # Ajust some more platform dependent stuff. case ${BUILD_SYS} in Modified: trunk/build/unix/buildsrc.mod_cluster.sh =================================================================== --- trunk/build/unix/buildsrc.mod_cluster.sh 2014-08-28 11:15:06 UTC (rev 3358) +++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-08-28 12:08:32 UTC (rev 3359) @@ -111,6 +111,12 @@ fi cp ${build_top}/buildsrc.cluster.sh ${package_src_dir} fi +# +# Add mod_bmx sources +if $has_bmx; then + bmxdirsources=`ls ${native_dist}/srclib/ | grep bmx-` + cp -rp ${native_dist}/srclib/${bmxdirsources}/modules/bmx ${dirsources}/modules +fi # # Copy the windows NMAKE files (and additional stuff). Modified: trunk/build/unix/package.list =================================================================== --- trunk/build/unix/package.list 2014-08-28 11:15:06 UTC (rev 3358) +++ trunk/build/unix/package.list 2014-08-28 12:08:32 UTC (rev 3359) @@ -70,7 +70,7 @@ mod_cluster|1.3.0.Final|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:v:8.34|cluster:t:1.3.0.Final mod_cluster|1.2.8.dev|2.2.21|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.39|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.2.x mod_cluster|1.2.8.Final|2.2.21|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.39|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.2.8.Final -mod_cluster|1.3.1.Alpha1|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|iconv:v:1.14|expat:v:1.95.8|pcre:v:8.34|cluster:t:master +mod_cluster|1.3.1.Alpha1|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|iconv:v:1.14|expat:v:1.95.8|pcre:v:8.34|bmx:v:0.9.5|cluster:t:master #mod_cluster|1.2.10.dev|2.2.21|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.39|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.2.10.dev traffic_server|TS_Trunk|trunk TC8|TC8_Trunk|trunk