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 2015/12/11 02:06:21 UTC
[4/6] git commit: [flex-asjs] [refs/heads/core_js_to_as] - add option
for using a native swc
add option for using a native swc
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a601ad51
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a601ad51
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a601ad51
Branch: refs/heads/core_js_to_as
Commit: a601ad51df0dc495a5c76941d8b35742645b2422
Parents: 313654f
Author: Alex Harui <ah...@apache.org>
Authored: Thu Dec 10 16:57:29 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Dec 10 16:57:29 2015 -0800
----------------------------------------------------------------------
manualtests/FlexJSTest_createjs/build.xml | 2 ++
manualtests/build_example.xml | 12 +++++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a601ad51/manualtests/FlexJSTest_createjs/build.xml
----------------------------------------------------------------------
diff --git a/manualtests/FlexJSTest_createjs/build.xml b/manualtests/FlexJSTest_createjs/build.xml
index 678ef0a..dd250a9 100644
--- a/manualtests/FlexJSTest_createjs/build.xml
+++ b/manualtests/FlexJSTest_createjs/build.xml
@@ -56,6 +56,8 @@
property="GOOG_HOME"
value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
+ <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/createjs/out/bin/createjs.swc"/>
+
<include file="${basedir}/../build_example.xml" />
<target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a601ad51/manualtests/build_example.xml
----------------------------------------------------------------------
diff --git a/manualtests/build_example.xml b/manualtests/build_example.xml
index 81a263e..f2d8791 100644
--- a/manualtests/build_example.xml
+++ b/manualtests/build_example.xml
@@ -153,6 +153,7 @@
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
<echo message="GOOG_HOME: ${GOOG_HOME}"/>
<property name="theme_arg" value="-define=CONFIG::theme,false" />
+ <property name="extlib_arg" value="-define=CONFIG::extlib,false" />
<java jar="${FALCONJX_HOME}/lib/mxmlc.jar" resultProperty="errorCode"
fork="true">
@@ -167,12 +168,11 @@
<arg value="-compiler.binding-value-change-event-type=valueChange" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="${extlib_arg}" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-closure-lib=${GOOG_HOME}" />
<arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
- <arg value="-external-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs/jquery_externals.js" />
- <arg value="-external-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs/createjs_externals.js" />
- <arg value="${basedir}/src/${example}.mxml" />
+ <arg value="${basedir}/src/${example}.mxml" />
</java>
<fail>
<condition>
@@ -192,6 +192,7 @@
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
<echo message="GOOG_HOME: ${GOOG_HOME}"/>
<property name="theme_arg" value="-define=CONFIG::theme,false" />
+ <property name="extlib_arg" value="-define=CONFIG::extlib,false" />
<java jar="${FALCONJX_HOME}/lib/mxmlc.jar" resultProperty="errorCode"
fork="true">
@@ -207,11 +208,10 @@
<arg value="-compiler.binding-value-change-event-type=valueChange" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="${extlib_arg}" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-closure-lib=${GOOG_HOME}" />
<arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
- <arg value="-external-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs/jquery_externals.js" />
- <arg value="-external-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs/createjs_externals.js" />
<arg value="${basedir}/src/${example}.mxml" />
</java>
<fail>
@@ -232,6 +232,7 @@
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
<echo message="GOOG_HOME: ${GOOG_HOME}"/>
<property name="theme_arg" value="-define=CONFIG::theme,false" />
+ <property name="extlib_arg" value="-define=CONFIG::extlib,false" />
<java jar="${FALCONJX_HOME}/lib/mxmlc.jar" resultProperty="errorCode"
fork="true">
@@ -248,6 +249,7 @@
<arg value="-compiler.binding-value-change-event-type=valueChange" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="${extlib_arg}" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-closure-lib=${GOOG_HOME}" />
<arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />