handle binary FlexUnit packaging
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/029eecec Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/029eecec Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/029eecec Branch: refs/heads/master Commit: 029eececa0863c56b33d9b90eee3d214b0732ba6 Parents: 0da5b9a Author: Alex Harui <[email protected]> Authored: Tue Oct 13 12:33:12 2015 -0700 Committer: Alex Harui <[email protected]> Committed: Tue Oct 13 12:33:19 2015 -0700 ---------------------------------------------------------------------- frameworks/projects/Core/as/tests/build.xml | 26 ++++++++++++++++++---- frameworks/projects/HTML/asjs/tests/build.xml | 24 +++++++++++++++++--- 2 files changed, 43 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/029eecec/frameworks/projects/Core/as/tests/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/as/tests/build.xml b/frameworks/projects/Core/as/tests/build.xml index 34c6700..85e142e 100644 --- a/frameworks/projects/Core/as/tests/build.xml +++ b/frameworks/projects/Core/as/tests/build.xml @@ -52,9 +52,27 @@ property="FLEXUNIT_HOME" value="${env.FLEXUNIT_HOME}"/> + <available file="${FLEXUNIT_HOME}/FlexUnit4/target" + type="dir" + property="FLEXUNIT_LIBPATH1" + value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4/target" /> + <property name="FLEXUNIT_LIBPATH1" value="-library-path+=${FLEXUNIT_HOME}/flexunit" /> + + <available file="${FLEXUNIT_HOME}/FlexUnit4CIListener/target" + type="dir" + property="FLEXUNIT_LIBPATH2" + value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4CIListener/target" /> + <property name="FLEXUNIT_LIBPATH2" value="-define=CONFIG::dummy,false" /> + + <available file="${FLEXUNIT_HOME}/FlexUnit4AntTasks/target" + type="dir" + property="FLEXUNIT_CLASSPATH" + value="${FLEXUNIT_HOME}/FlexUnit4AntTasks/target" /> + <property name="FLEXUNIT_CLASSPATH" value="${FLEXUNIT_HOME}/flexunit" /> + <target name="main" depends="clean,compile,test" description="Clean test of FlexJSUI.swc"> </target> - + <target name="clean"> <delete failonerror="false"> <fileset dir="${basedir}"> @@ -107,15 +125,15 @@ <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="-source-path+=${FLEXJS_HOME}/frameworks/projects/Core/as/src" /> <arg value="-library-path+=${FLEXJS_HOME}/frameworks/libs" /> - <arg value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4/target" /> - <arg value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4CIListener/target" /> + <arg value="${FLEXUNIT_LIBPATH1}" /> + <arg value="${FLEXUNIT_LIBPATH2}" /> </mxmlc> </target> <target name="test"> <taskdef resource="flexUnitTasks.tasks"> <classpath> - <fileset dir="${FLEXUNIT_HOME}/FlexUnit4AntTasks/target"> + <fileset dir="${FLEXUNIT_CLASSPATH}"> <include name="flexUnitTasks*.jar" /> </fileset> </classpath> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/029eecec/frameworks/projects/HTML/asjs/tests/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/asjs/tests/build.xml b/frameworks/projects/HTML/asjs/tests/build.xml index e89d550..4a12b75 100644 --- a/frameworks/projects/HTML/asjs/tests/build.xml +++ b/frameworks/projects/HTML/asjs/tests/build.xml @@ -52,6 +52,24 @@ property="FLEXUNIT_HOME" value="${env.FLEXUNIT_HOME}"/> + <available file="${FLEXUNIT_HOME}/FlexUnit4/target" + type="dir" + property="FLEXUNIT_LIBPATH1" + value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4/target" /> + <property name="FLEXUNIT_LIBPATH1" value="-library-path+=${FLEXUNIT_HOME}/flexunit" /> + + <available file="${FLEXUNIT_HOME}/FlexUnit4CIListener/target" + type="dir" + property="FLEXUNIT_LIBPATH2" + value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4CIListener/target" /> + <property name="FLEXUNIT_LIBPATH2" value="-define=CONFIG::dummy,false" /> + + <available file="${FLEXUNIT_HOME}/FlexUnit4AntTasks/target" + type="dir" + property="FLEXUNIT_CLASSPATH" + value="${FLEXUNIT_HOME}/FlexUnit4AntTasks/target" /> + <property name="FLEXUNIT_CLASSPATH" value="${FLEXUNIT_HOME}/flexunit" /> + <target name="main" depends="clean,compile,test" description="Clean test of FlexJSUI.swc"> </target> @@ -103,15 +121,15 @@ <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="-source-path+=${FLEXJS_HOME}/frameworks/projects/HTML/asjs/src" /> <arg value="-library-path+=${FLEXJS_HOME}/frameworks/libs" /> - <arg value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4/target" /> - <arg value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4CIListener/target" /> + <arg value="${FLEXUNIT_LIBPATH1}" /> + <arg value="${FLEXUNIT_LIBPATH2}" /> </mxmlc> </target> <target name="test"> <taskdef resource="flexUnitTasks.tasks"> <classpath> - <fileset dir="${FLEXUNIT_HOME}/FlexUnit4AntTasks/target"> + <fileset dir="${FLEXUNIT_CLASSPATH}"> <include name="flexUnitTasks*.jar" /> </fileset> </classpath>
