Author: jfrederic.clere(a)jboss.com Date: 2013-07-19 02:09:19 -0400 (Fri, 19 Jul 2013) New Revision: 3136 Modified: trunk/build/unix/buildsrc.mod_cluster.sh trunk/build/unix/util/ckeckdownload.sh Log: make sure that patches for httpd are once and at the right moment. Modified: trunk/build/unix/buildsrc.mod_cluster.sh =================================================================== --- trunk/build/unix/buildsrc.mod_cluster.sh 2013-07-19 05:51:47 UTC (rev 3135) +++ trunk/build/unix/buildsrc.mod_cluster.sh 2013-07-19 06:09:19 UTC (rev 3136) @@ -44,7 +44,7 @@ if [ "${BUILD_SYS}" = "windows" ]; then URLHTTP=http://archive.apache.org/dist/httpd/httpd-${httpd_version}-win32... fi -util/ckeckdownload.sh $build_cache_dir $package_src_dir $build_top httpd-${httpd_version} ${URLHTTP} "NONE" +util/ckeckdownload.sh $build_cache_dir $package_src_dir $build_top httpd-${httpd_version} ${URLHTTP} "NONE" false if [ $? -ne 0 ]; then echo "util/ckeckdownload httpd failed" exit 1 Modified: trunk/build/unix/util/ckeckdownload.sh =================================================================== --- trunk/build/unix/util/ckeckdownload.sh 2013-07-19 05:51:47 UTC (rev 3135) +++ trunk/build/unix/util/ckeckdownload.sh 2013-07-19 06:09:19 UTC (rev 3136) @@ -63,13 +63,16 @@ src_dir=$1 src_url=$2 src_url_back=$3 + src_patching=$4 cd $build_cache_dir if [ ! -d ${src_dir} ]; then downloadtaredsrc $src_url $src_url_back if [ $? -ne 0 ]; then return 1 fi - $build_top/util/applypatch.sh $build_top $src_dir false + if [ $src_patching ]; then + $build_top/util/applypatch.sh $build_top $src_dir false + fi fi cp -rp ${src_dir} ${package_src_dir}/srclib cd $build_top @@ -89,11 +92,23 @@ src_dir=$4 url=$5 urlback=$6 +patching=$7 +echo "" +echo "Running `basename $0` $LastChangedDate$" +echo "" +echo "Started : `date`" +echo "Params : $@" +echo "" + echo "url: $url urlback: $urlback" +if [ "x$patching" = "x" ]; then + patching=false +fi +echo "patching: $patching" # Call the internal functions. -ckeckdownload $src_dir $url $urlback +ckeckdownload $src_dir $url $urlback $patching if [ $? -ne 0 ]; then echo "ckeckdownload src_dir: $src_dir url: $url urlback: $urlback FAILED!" exit 1