You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2016/05/25 18:25:26 UTC
[19/19] git commit: [flex-falcon] [refs/heads/develop] - try using
--ignore-whitespace so patches might work on both win and mac
try using --ignore-whitespace so patches might work on both win and mac
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/791c65b1
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/791c65b1
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/791c65b1
Branch: refs/heads/develop
Commit: 791c65b1909d0f5f50771e39e594552971938cd1
Parents: a075889
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 25 11:24:42 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 25 11:24:42 2016 -0700
----------------------------------------------------------------------
externs/createjs/build.xml | 6 +-
externs/createjs/src/main/patch/easeljs.patch | 5692 ++++++++++----------
externs/createjs/src/main/patch/tweenjs.patch | 80 +-
3 files changed, 2963 insertions(+), 2815 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/791c65b1/externs/createjs/build.xml
----------------------------------------------------------------------
diff --git a/externs/createjs/build.xml b/externs/createjs/build.xml
index 63c8c2f..f80bb6e 100644
--- a/externs/createjs/build.xml
+++ b/externs/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" >