try using --ignore-whitespace so patches might work on both win and mac
Project: http://git-wip-us.apache.org/repos/asf/flex-typedefs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-typedefs/commit/9a13a07b Tree: http://git-wip-us.apache.org/repos/asf/flex-typedefs/tree/9a13a07b Diff: http://git-wip-us.apache.org/repos/asf/flex-typedefs/diff/9a13a07b Branch: refs/heads/master Commit: 9a13a07b699743248aabfa8731ef71b9714fd714 Parents: dab56b5 Author: Alex Harui <[email protected]> Authored: Wed May 25 11:24:42 2016 -0700 Committer: Alex Harui <[email protected]> Committed: Wed May 25 11:24:42 2016 -0700 ---------------------------------------------------------------------- createjs/build.xml | 6 +- createjs/src/main/patch/easeljs.patch | 5692 ++++++++++++++-------------- createjs/src/main/patch/tweenjs.patch | 80 +- 3 files changed, 2963 insertions(+), 2815 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/9a13a07b/createjs/build.xml ---------------------------------------------------------------------- diff --git a/createjs/build.xml b/createjs/build.xml index 63c8c2f..f80bb6e 100644 --- a/createjs/build.xml +++ b/createjs/build.xml @@ -238,13 +238,11 @@ <unzip src="${basedir}/target/downloads/easel-${createjs.version}.zip" dest="${basedir}/target/reference"> </unzip> - <fixcrlf srcdir="${basedir}/target/reference/EaselJS-${createjs.version}" eol="unix" /> <mkdir dir="${basedir}/target/reference" /> <delete dir="${basedir}/target/reference/TweenJS-${tweenjs.version}" /> <unzip src="${basedir}/target/downloads/tween-${tweenjs.version}.zip" dest="${basedir}/target/reference"> </unzip> - <fixcrlf srcdir="${basedir}/target/reference/TweenJS-${tweenjs.version}" eol="unix" /> <delete dir="${basedir}/src/main/patch" /> <mkdir dir="${basedir}/src/main/patch" /> <exec executable="git" output="${basedir}/src/main/patch/easeljs.patch" > @@ -270,10 +268,12 @@ <target name="preprocess" depends="expandzip, expandzip_tween"> <exec executable="git" dir="${basedir}/../.."> <arg value="apply"/> + <arg value="--ignore-whitespace"/> <arg value="${basedir}/src/main/patch/easeljs.patch"/> </exec> <exec executable="git" dir="${basedir}/../.."> <arg value="apply"/> + <arg value="--ignore-whitespace"/> <arg value="${basedir}/src/main/patch/tweenjs.patch"/> </exec> </target> @@ -284,7 +284,6 @@ <unzip src="${basedir}/target/downloads/easel-${createjs.version}.zip" dest="${basedir}/target/downloads"> </unzip> - <fixcrlf srcdir="${basedir}/target/downloads/EaselJS-${createjs.version}" eol="unix" /> </target> <target name="expandzip_tween"> @@ -293,7 +292,6 @@ <unzip src="${basedir}/target/downloads/tween-${tweenjs.version}.zip" dest="${basedir}/target/downloads"> </unzip> - <fixcrlf srcdir="${basedir}/target/downloads/TweenJS-${tweenjs.version}" eol="unix" /> </target> <target name="preprocessfile" >
