Author: jfrederic.clere(a)jboss.com
Date: 2014-08-23 09:37:58 -0400 (Sat, 23 Aug 2014)
New Revision: 3350
Modified:
trunk/build/unix/build.sh
Log:
convert to unix format and apply for non zip files on windows.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2014-08-23 10:36:39 UTC (rev 3349)
+++ trunk/build/unix/build.sh 2014-08-23 13:37:58 UTC (rev 3350)
@@ -1216,8 +1216,13 @@
if [ -f $build_top/../patch/$filename ]; then
(cd $DIR
echo "Applying patch $build_top/../patch/$filename in $DIR"
- if [ $BUILD_WIN -a $iszip ]; then
- $patch --binary -tf -p0 -i $build_top/../patch/$filename
+ if [ $BUILD_WIN ]; then
+ if [ $iszip ]; then
+ $patch --binary -tf -p0 -i $build_top/../patch/$filename
+ else
+ dos2unix build_top/../patch/$filename
+ $patch -tf -p0 -i $build_top/../patch/$filename
+ fi
else
$patch -tf -p0 -i $build_top/../patch/$filename
fi
Show replies by date