Repository: flex-asjs Updated Branches: refs/heads/dual 05266b409 -> 7402b13de
fix checkintests Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7402b13d Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7402b13d Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7402b13d Branch: refs/heads/dual Commit: 7402b13de045c06747478e639d2b16a0ac11cabd Parents: 05266b4 Author: Alex Harui <[email protected]> Authored: Wed Mar 1 23:41:20 2017 -0800 Committer: Alex Harui <[email protected]> Committed: Wed Mar 1 23:41:20 2017 -0800 ---------------------------------------------------------------------- build.xml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7402b13d/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index f09eabd..e995fcc 100644 --- a/build.xml +++ b/build.xml @@ -1239,6 +1239,7 @@ </target> <target name="basictests-compile-js"> + <!-- now built by dual mode <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> <property name="GOOG_HOME" value="${env.GOOG_HOME}"/> @@ -1275,6 +1276,7 @@ </not> </condition> </fail> + --> </target> <target name="basictests-compile-java" > @@ -1391,21 +1393,33 @@ <target name="load-task" depends="runtime-setup"> <!-- load the <mxmlc> task; we can't do this at the <project> level --> <!-- because targets that run before flexTasks.jar gets built would fail --> - <taskdef resource="flexTasks.tasks" classpath="${FALCON_HOME}/lib/falcon-flexTasks.jar"/> + <taskdef resource="flexTasks.tasks" classpath="${FALCONJX_HOME}/lib/falcon-flexTasks.jar"/> </target> <target name="basictests" depends="check-flex-home,load-task" description="run basic tests using mustella"> <property name="FLEX_HOME" value="${basedir}" /> <mxmlc fork="true" debug="true" + closure-lib="${env.GOOG_HOME}" file="${basedir}/mustella/tests/basicTests/BasicTestsApp.mxml"> <jvmarg line="${mxmlc.jvm.args}"/> - <arg line="-compiler.mxml.children-as-data=true" /> <library-path dir="${FLEX_SDK_HOME}" append="true"> <include name="mustella/mustella.swc"/> <include name="frameworks/libs/framework.swc"/> <include name="frameworks/locale/en_US/framework_rb.swc"/> </library-path> + <js-external-library-path dir="${env.PLAYERGLOBAL_HOME}"> + <include name="${playerglobal.version}/playerglobal.swc"/> + </js-external-library-path> + <js-library-path dir="${basedir}" > + <include name="frameworks/libs"/> + </js-library-path> + <js-library-path dir="${FLEX_SDK_HOME}" append="true"> + <include name="mustella/mustella.swc"/> + <include name="frameworks/libs/framework.swc"/> + <include name="frameworks/locale/en_US/framework_rb.swc"/> + </js-library-path> + <arg value="-sdk-js-lib=${FLEXJS_HOME}/mustella/js" /> </mxmlc> <mkdir dir="${basedir}/mustella/tests/basicTests/fonts" /> <copy todir="${basedir}/mustella/tests/basicTests/fonts" >
