fix issues after merge
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/e2f3391e Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/e2f3391e Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/e2f3391e Branch: refs/heads/develop Commit: e2f3391e3aaa76c5f2351b0b4eff55354634ef67 Parents: bd84441 Author: Alex Harui <[email protected]> Authored: Mon Apr 25 13:19:00 2016 -0700 Committer: Alex Harui <[email protected]> Committed: Mon Apr 25 13:19:00 2016 -0700 ---------------------------------------------------------------------- externs/createjs/build.xml | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e2f3391e/externs/createjs/build.xml ---------------------------------------------------------------------- diff --git a/externs/createjs/build.xml b/externs/createjs/build.xml index cbb7466..98ed9d3 100644 --- a/externs/createjs/build.xml +++ b/externs/createjs/build.xml @@ -196,35 +196,13 @@ <unzip src="${basedir}/in/tween-${tweenjs.version}.zip" dest="${basedir}/target"> </unzip> + <move file="${basedir}/target/TweenJS-${tweenjs.version}/src/tweenjs" + todir="${basedir}/target/EaselJS-${createjs.version}/src" /> </target> <target name="preprocessfile" > <basename property="file.base" file="${file}" suffix=".js"/> <echo>file.base is ${file.base}</echo> -<<<<<<< HEAD - <replace file="${basedir}/externs/${file}" token="this.createjs = this.createjs||{};" value="" /> - <replace file="${basedir}/externs/${file}" token="this.createjs = this.createjs || {};" value="" /> - <replace file="${basedir}/externs/${file}" token="(function() {" value="" /> - <replace file="${basedir}/externs/${file}" token="(function () {" value="" /> - <replace file="${basedir}/externs/${file}" token="setTimeout " value="setTimeout(function() {" /> - <replace file="${basedir}/externs/${file}" token="}());" value="" /> - <replace file="${basedir}/externs/${file}" token="})();" value="" /> - <replace file="${basedir}/externs/${file}" token="@param [time] {Number}" value="@param {Number} time" /> - <replace file="${basedir}/externs/${file}" token="function ${file.base}(" value="createjs.${file.base} = function(" /> - <replace file="${basedir}/externs/${file}" token="@param data" value="@param {Object} data" /> - <replace file="${basedir}/externs/${file}" token="@param ratio" value="@param {Number} ratio" /> - <replace file="${basedir}/externs/${file}" token="@param target" value="@param {Object} target" /> - <replace file="${basedir}/externs/${file}" token="{any}" value="{Object}" /> - <replaceregexp file="${basedir}/externs/${file}" match="\s"use strict";" replace="" /> - <replaceregexp file="${basedir}/externs/${file}" match="\screatejs.${file.base} = .*;" replace="" /> - <replaceregexp file="${basedir}/externs/${file}" match="var p = createjs.extend.*;" replace="" /> - <replaceregexp file="${basedir}/externs/${file}" match="var p = ${file.base}.prototype;" replace="" /> - <replaceregexp file="${basedir}/externs/${file}" match="var s = ${file.base};" replace="" /> - <replaceregexp file="${basedir}/externs/${file}" match="\sp\." replace="${file.base}.prototype." flags="g"/> - <replaceregexp file="${basedir}/externs/${file}" match="\ss\." replace="${file.base}." flags="g"/> - <replaceregexp file="${basedir}/externs/${file}" match="${file.base}\." replace="createjs.${file.base}." flags="g"/> - <replaceregexp file="${basedir}/externs/${file}" match="\stry [{]\s*Object.defineProperties[(]p, [{]\s*(.*):\s(.*)[}] catch [(]e[)] [{][}]" -======= <replace file="${basedir}/target/EaselJS-${createjs.version}/src/${file}" token="this.createjs = this.createjs||{};" value="" /> <replace file="${basedir}/target/EaselJS-${createjs.version}/src/${file}" token="this.createjs = this.createjs || {};" value="" /> <replace file="${basedir}/target/EaselJS-${createjs.version}/src/${file}" token="(function() {" value="" /> @@ -262,7 +240,7 @@ <target name="preprocessTicker"> <replaceregexp file="${basedir}/target/EaselJS-${createjs.version}/src/createjs/utils/Ticker.js" match="@static" replace="@constructor" /> - <replace file="${basedir}/externs/createjs/utils/Ticker.js" token="createjs.Ticker.addEventListener = function()" value="createjs.Ticker.addEventListener = function(type, handler)" /> + <replace file="${basedir}/target/EaselJS-${createjs.version}/src/createjs/utils/Ticker.js" token="createjs.Ticker.addEventListener = function()" value="createjs.Ticker.addEventListener = function(type, handler)" /> </target> <target name="preprocessGraphics" >
