You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ad...@apache.org on 2016/01/12 20:43:05 UTC
git commit: [flex-falcon] [refs/heads/develop] - moved .js
preprocessing steps to the beginning of externc.js.swc build target to fix
the problem where js.swc output was incorrect until the second build
Repository: flex-falcon
Updated Branches:
refs/heads/develop b74b09dd2 -> 3044c462a
moved .js preprocessing steps to the beginning of externc.js.swc build target to fix the problem where js.swc output was incorrect until the second build
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/3044c462
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/3044c462
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/3044c462
Branch: refs/heads/develop
Commit: 3044c462a2ee73376f292043c41f15ce606f4740
Parents: b74b09d
Author: Andy Dufilie <ad...@apache.org>
Authored: Tue Jan 12 14:38:39 2016 -0500
Committer: Andy Dufilie <ad...@apache.org>
Committed: Tue Jan 12 14:38:55 2016 -0500
----------------------------------------------------------------------
build.xml | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3044c462/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 55d9693..ad753f1 100644
--- a/build.xml
+++ b/build.xml
@@ -631,13 +631,22 @@
</target>
<target name="externc.js.swc" >
- <java jar="${basedir}/compiler.jx/lib/externc.jar" fork="true"
+ <!-- preprocessing .js files -->
+ <replaceregexp file="${basedir}/externs/js/externs/svg.js" match="@type \{function\(new:.*" replace="" flags="g" />
+ <replaceregexp file="${basedir}/externs/js/externs/svg.js" match="Window\.prototype\..*" replace="" flags="g" />
+ <replace file="${basedir}/externs/js/externs/svg.js" token="EventListener|(function(Event)" value="EventListener|(function(!Event)" />
+ <replaceregexp file="${basedir}/externs/js/externs/es3.js" match="(The constructor of the current object(?:(?!\*/).)*?)@type \{Function\}((?:(?!\*/).)*?\*/[\r\n]+Object\.prototype\.constructor)([^;]*?);" replace="\1@type {Class}\2;" flags="s" />
+ <replaceregexp file="${basedir}/externs/js/externs/es3.js" match="(Transposes the elements of an array in place(?:(?!\*/).)*?[\r\n]+ \*)([\r\n]+)( \* @this)" replace="\1\2 * @return {!Array<?>}\2\3" flags="s" />
+ <replaceregexp file="${basedir}/externs/js/externs/es3.js" match="(Sorts the elements of an array in place(?:(?!\*/).)*?[\r\n]+ \*)([\r\n]+)( \* @param)" replace="\1\2 * @return {!Array<?>}\2\3" flags="s" />
+
+ <java jar="${basedir}/compiler.jx/lib/externc.jar" fork="true"
failonerror="false">
<arg value="+flexlib=externs" />
<arg value="-debug" />
<arg value="-load-config=externs/js/js-compile-config.xml" />
</java>
- <copy file="${basedir}/externs/js/src/AS3.as" tofile="${basedir}/externs/js/out/as/classes/AS3.as" />
+
+ <copy file="${basedir}/externs/js/src/AS3.as" tofile="${basedir}/externs/js/out/as/classes/AS3.as" />
<mkdir dir="${basedir}/externs/js/out/as/classes/__AS3__/vec" />
<copy file="${basedir}/externs/js/src/Vector.as" tofile="${basedir}/externs/js/out/as/classes/__AS3__/vec/Vector.as" />
<copy file="${basedir}/externs/js/src/Vector-template.as" tofile="${basedir}/externs/js/out/as/classes/__AS3__/vec/Vector$object.as" />
@@ -660,13 +669,8 @@
<replacefilter token="$t" value="$uint" />
<replacefilter token=":T" value=":uint" />
</replace>
- <replaceregexp file="${basedir}/externs/js/externs/svg.js" match="@type \{function\(new:.*" replace="" flags="g" />
- <replaceregexp file="${basedir}/externs/js/externs/svg.js" match="Window\.prototype\..*" replace="" flags="g" />
- <replace file="${basedir}/externs/js/externs/svg.js" token="EventListener|(function(Event)" value="EventListener|(function(!Event)" />
- <replaceregexp file="${basedir}/externs/js/externs/es3.js" match="(The constructor of the current object(?:(?!\*/).)*?)@type \{Function\}((?:(?!\*/).)*?\*/[\r\n]+Object\.prototype\.constructor)([^;]*?);" replace="\1@type {Class}\2;" flags="s" />
- <replaceregexp file="${basedir}/externs/js/externs/es3.js" match="(Transposes the elements of an array in place(?:(?!\*/).)*?[\r\n]+ \*)([\r\n]+)( \* @this)" replace="\1\2 * @return {!Array<?>}\2\3" flags="s" />
- <replaceregexp file="${basedir}/externs/js/externs/es3.js" match="(Sorts the elements of an array in place(?:(?!\*/).)*?[\r\n]+ \*)([\r\n]+)( \* @param)" replace="\1\2 * @return {!Array<?>}\2\3" flags="s" />
- <java jar="${basedir}/compiler/generated/dist/sdk/lib/falcon-compc.jar" fork="true"
+
+ <java jar="${basedir}/compiler/generated/dist/sdk/lib/falcon-compc.jar" fork="true"
failonerror="true">
<arg value="+flexlib=externs" />
<arg value="-debug" />