You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pe...@apache.org on 2016/04/25 18:28:12 UTC
git commit: [flex-falcon] [refs/heads/develop] - Updates for CreateJS
to add TweenJS.
Repository: flex-falcon
Updated Branches:
refs/heads/develop b4e4fadb7 -> 986e5c191
Updates for CreateJS to add TweenJS.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/986e5c19
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/986e5c19
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/986e5c19
Branch: refs/heads/develop
Commit: 986e5c191ce7ed2696c9223cc5725f3a36432bc2
Parents: b4e4fad
Author: Peter Ent <pe...@apache.org>
Authored: Mon Apr 25 12:28:09 2016 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Mon Apr 25 12:28:09 2016 -0400
----------------------------------------------------------------------
externs/createjs/build.xml | 69 +++++++++++++++++++++--
externs/createjs/createjs-compile-config.xml | 5 +-
2 files changed, 68 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/986e5c19/externs/createjs/build.xml
----------------------------------------------------------------------
diff --git a/externs/createjs/build.xml b/externs/createjs/build.xml
index 09ff653..192a237 100644
--- a/externs/createjs/build.xml
+++ b/externs/createjs/build.xml
@@ -22,18 +22,25 @@
<project name="createjs" default="main" basedir=".">
<property name="createjs.version" value="0.8.0" />
+ <property name="tweenjs.version" value="0.6.2" />
- <target name="main" depends="download, preprocess" />
-
+ <target name="main" depends="download, download_tween, preprocess" />
+
<target name="download" >
<mkdir dir="${basedir}/in" />
<get src="https://github.com/CreateJS/EaselJS/archive/${createjs.version}.zip"
- dest="${basedir}/in/${createjs.version}.zip" skipexisting="true"/>
+ dest="${basedir}/in/easel-${createjs.version}.zip" skipexisting="true"/>
+ </target>
+
+ <target name="download_tween" >
+ <mkdir dir="${basedir}/in" />
+ <get src="https://github.com/CreateJS/TweenJS/archive/${tweenjs.version}.zip"
+ dest="${basedir}/in/tween-${tweenjs.version}.zip" skipexisting="true"/>
</target>
<!-- createjs files have certain patterns that fool our compilers.
we process each file to make it look a bit more like what we expect -->
- <target name="preprocess" depends="expandzip">
+ <target name="preprocess" depends="expandzip, expandzip_tween">
<antcall target="preprocessfile" >
<param name="file" value="createjs/events/Event.js" />
</antcall>
@@ -151,12 +158,35 @@
<antcall target="preprocessGraphics" />
<antcall target="preprocessMouseEvent" />
<antcall target="preprocessMovieClip" />
+ <antcall target="preprocessTicker" />
<antcall target="rename.in.jsdoc" />
+ <!-- TweenJS -->
+ <antcall target="preprocessfile" >
+ <param name="file" value="tweenjs/CSSPlugin.js" />
+ </antcall>
+ <antcall target="preprocessfile" >
+ <param name="file" value="tweenjs/Ease.js" />
+ </antcall>
+ <antcall target="preprocessfile" >
+ <param name="file" value="tweenjs/MotionGuidePlugin.js" />
+ </antcall>
+ <antcall target="preprocessfile" >
+ <param name="file" value="tweenjs/SamplePlugin.js" />
+ </antcall>
+ <antcall target="preprocessfile" >
+ <param name="file" value="tweenjs/Timeline.js" />
+ </antcall>
+ <antcall target="preprocessfile" >
+ <param name="file" value="tweenjs/Tween.js" />
+ </antcall>
+ <antcall target="preprocessEase" />
+ <antcall target="preprocessTween" />
+ <antcall target="preprocessTicker" />
</target>
<target name="expandzip">
<mkdir dir="${basedir}/externs" />
- <unzip src="${basedir}/in/${createjs.version}.zip"
+ <unzip src="${basedir}/in/easel-${createjs.version}.zip"
dest="${basedir}/externs">
<patternset>
<include name="EaselJS-${createjs.version}/src/**" />
@@ -165,6 +195,17 @@
</unzip>
</target>
+ <target name="expandzip_tween">
+ <mkdir dir="${basedir}/externs" />
+ <unzip src="${basedir}/in/tween-${tweenjs.version}.zip"
+ dest="${basedir}/externs">
+ <patternset>
+ <include name="TweenJS-${tweenjs.version}/src/**" />
+ </patternset>
+ <cutdirsmapper dirs="2"/>
+ </unzip>
+ </target>
+
<target name="preprocessfile" >
<basename property="file.base" file="${file}" suffix=".js"/>
<echo>file.base is ${file.base}</echo>
@@ -177,6 +218,10 @@
<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="" />
@@ -190,6 +235,20 @@
<replaceregexp file="${basedir}/externs/${file}" match="\s@extends\s(.*)" replace=" @extends createjs.\1" />
</target>
+ <target name="preprocessTween">
+ <replaceregexp file="${basedir}/externs/tweenjs/Tween.js" match="@constructor" replace="@static" flags="gs" />
+ <replaceregexp file="${basedir}/externs/tweenjs/Tween.js" match="@static" replace="@constructor" />
+ </target>
+
+ <target name="preprocessEase">
+ <replaceregexp file="${basedir}/externs/tweenjs/Ease.js" match="@static" replace="@constructor" />
+ </target>
+
+ <target name="preprocessTicker">
+ <replaceregexp file="${basedir}/externs/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)" />
+ </target>
+
<target name="preprocessGraphics" >
<replaceregexp file="${basedir}/externs/easeljs/display/Graphics.js" match="\s[(]G\..*function[(]ctx[)] [{].*[}];" replace="" flags="gs" />
</target>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/986e5c19/externs/createjs/createjs-compile-config.xml
----------------------------------------------------------------------
diff --git a/externs/createjs/createjs-compile-config.xml b/externs/createjs/createjs-compile-config.xml
index e2ee0ad..1be8cd7 100644
--- a/externs/createjs/createjs-compile-config.xml
+++ b/externs/createjs/createjs-compile-config.xml
@@ -56,7 +56,7 @@
<path-element>src</path-element>
</source-path>
- <warn-no-constructor>false</warn-no-constructor>
+ <warn-no-constructor>true</warn-no-constructor>
</compiler>
<external>
@@ -99,6 +99,9 @@
<path-element>externs/easeljs/utils/SpriteSheetBuilder.js</path-element>
<path-element>externs/easeljs/utils/SpriteSheetUtils.js</path-element>
<path-element>externs/easeljs/utils/UID.js</path-element>
+ <path-element>externs/tweenjs/Ease.js</path-element>
+ <path-element>externs/tweenjs/Timeline.js</path-element>
+ <path-element>externs/tweenjs/Tween.js</path-element>
</external>
<as-root>out/as</as-root>