Author: jfrederic.clere(a)jboss.com Date: 2014-08-23 06:36:39 -0400 (Sat, 23 Aug 2014) New Revision: 3349 Modified: trunk/build/unix/build.sh Log: Only use binary for zip files... Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2014-08-23 10:10:16 UTC (rev 3348) +++ trunk/build/unix/build.sh 2014-08-23 10:36:39 UTC (rev 3349) @@ -1191,10 +1191,12 @@ # Apply patch for the component # $1 directory of the component like apr-1.2.8 # $2 also apply the rhel patches. +# $3 use binary patch for windows (for zip files). applypatch() { DIR=$1 isrhel=$2 + iszip=$3 basefilename=`basename $DIR` filename=$basefilename.patch echo "function applypatch for ${DIR}" @@ -1214,7 +1216,7 @@ if [ -f $build_top/../patch/$filename ]; then (cd $DIR echo "Applying patch $build_top/../patch/$filename in $DIR" - if $BUILD_WIN ; then + if [ $BUILD_WIN -a $iszip ]; then $patch --binary -tf -p0 -i $build_top/../patch/$filename else $patch -tf -p0 -i $build_top/../patch/$filename @@ -1246,7 +1248,14 @@ exit 1 fi $build_top/util/overridecp.sh $build_top/../../srclib/ ${name_prod} ${version_prod} NMAKEmakefile $src_dir - applypatch $src_dir false + case $src_url in + *.zip) + applypatch $src_dir false true + ;; + *) + applypatch $src_dir false false + ;; + esac fi cp -rp ${src_dir} ${package_src_dir}/srclib # also copy common files... @@ -1315,7 +1324,7 @@ fi util/buildrhelsrc.sh http://cvs.devel.redhat.com/repo/dist/openssl openssl/RHEL-5 ${tag} ${package_src_dir} openssl rhel-httpd ${build_version} openssl_dir=${package_src_dir}/srclib/`ls ${package_src_dir}/srclib | grep openssl-` - applypatch ${openssl_dir} true + applypatch ${openssl_dir} true false else echo "${ssl_type} not support for openssl" exit 1