Author: jfrederic.clere(a)jboss.com Date: 2014-01-27 08:14:15 -0500 (Mon, 27 Jan 2014) New Revision: 3203 Modified: trunk/build/unix/buildbin.mod_cluster.windows.sh trunk/build/unix/buildsrc.mod_cluster.sh Log: separate httpd-2.4 and httpd-2.2 Modified: trunk/build/unix/buildbin.mod_cluster.windows.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.windows.sh 2014-01-27 12:43:33 UTC (rev 3202) +++ trunk/build/unix/buildbin.mod_cluster.windows.sh 2014-01-27 13:14:15 UTC (rev 3203) @@ -60,10 +60,18 @@ add_conf="${add_conf} WITH_OPENSSL=${win_common_loc}" fi -mkdir -p ${output_loc}/httpd-2.2 -win_output_loc=`cygpath -w -a ${output_loc}/httpd-2.2` +case ${httpd_version} in + 2.2*) + dirhttpd=httpd-2.2 + ;; + 2.4*) + dirhttpd=httpd-2.4 + ;; +esac +mkdir -p ${output_loc}/${dirhttpd} +win_output_loc=`cygpath -w -a ${output_loc}/${dirhttpd}` -native_sources=srclib/`ls srclib | grep httpd-2.2` +native_sources=srclib/`ls srclib | grep ${dirhttpd}` src_dir=`cygpath -w -a ${native_sources}` (cd $native_sources Modified: trunk/build/unix/buildsrc.mod_cluster.sh =================================================================== --- trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-27 12:43:33 UTC (rev 3202) +++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-27 13:14:15 UTC (rev 3203) @@ -94,13 +94,22 @@ # # Copy the windows NMAKE files (and additional stuff). -dirnmake=${build_svn_root}/httpd/httpd-2.2/ +case ${httpd_version} in + 2.2*) + dirnmake=${build_svn_root}/httpd/httpd-2.2/ + dirhttpd=httpd-2.2 + ;; + 2.4*) + dirnmake=${build_svn_root}/httpd/httpd-2.4/ + dirhttpd=httpd-2.4 + ;; +esac if [ -d ${dirnmake} ]; then #svn export --force ${dirnmake} ${dirsources} - svn export --force http://anonsvn.jboss.org/repos/jbossnative/trunk/httpd/httpd-2.2 ${dirsources} + svn export --force http://anonsvn.jboss.org/repos/jbossnative/trunk/httpd/${dirhttpd} ${dirsources} if [ $? -ne 0 ]; then #echo "svn export --force ${dirnmake} ${dirsources} FAILED" - echo "svn export --force http://anonsvn.jboss.org/repos/jbossnative/trunk/httpd/httpd-2.2 ${dirsources} FAILED" + echo "svn export --force http://anonsvn.jboss.org/repos/jbossnative/trunk/httpd/${dirhttpd} ${dirsources} FAILED" exit 1 fi # Apply patches for iconv