Author: jfrederic.clere(a)jboss.com
Date: 2014-08-23 05:05:56 -0400 (Sat, 23 Aug 2014)
New Revision: 3346
Modified:
trunk/build/unix/build.sh
Log:
The patches are now with CR LF on windows... binary for patch weird.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2014-08-23 08:56:33 UTC (rev 3345)
+++ trunk/build/unix/build.sh 2014-08-23 09:05:56 UTC (rev 3346)
@@ -1214,7 +1214,11 @@
if [ -f $build_top/../patch/$filename ]; then
(cd $DIR
echo "Applying patch $build_top/../patch/$filename in $DIR"
- $patch -tf -p0 -i $build_top/../patch/$filename
+ if $BUILD_WIN ; then
+ $patch --binary -tf -p0 -i $build_top/../patch/$filename
+ else
+ $patch -tf -p0 -i $build_top/../patch/$filename
+ fi
) || return 1
else
echo "function applypatch no patch for ${DIR}"
Show replies by date