update files after folder rename/refactor
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/980ee4da Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/980ee4da Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/980ee4da Branch: refs/heads/mavenfolders Commit: 980ee4da92683bf590a9be02a66e6a731c7c6ab7 Parents: 35cbbe9 Author: Alex Harui <[email protected]> Authored: Mon Jan 11 14:22:15 2016 -0800 Committer: Alex Harui <[email protected]> Committed: Mon Jan 11 14:22:15 2016 -0800 ---------------------------------------------------------------------- frameworks/projects/HTML/build.xml | 67 ++++++++++---------- .../src/main/resources/compile-asjs-config.xml | 10 +-- .../HTML/src/main/resources/compile-config.xml | 14 ++-- .../projects/HTML/src/test/flex/build.xml | 14 ++-- 4 files changed, 57 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/980ee4da/frameworks/projects/HTML/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/build.xml b/frameworks/projects/HTML/build.xml index 517681c..df29536 100644 --- a/frameworks/projects/HTML/build.xml +++ b/frameworks/projects/HTML/build.xml @@ -28,15 +28,14 @@ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <property name="target.name" value="HTML-${release.version}.swc" /> + <property name="target.name.no.version" value="HTML.swc" /> <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of HTML.swc"> </target> <target name="test" unless="is.jenkins"> - <!-- no tests yet - <ant dir="as/tests" /> - --> - <ant dir="as/tests" /> + <ant dir="src/test/flex"/> </target> <target name="test-js" unless="is.jenkins"> @@ -48,11 +47,11 @@ <target name="clean"> <delete failonerror="false"> <fileset dir="${FLEXJS_HOME}/frameworks/libs"> - <include name="HTML.swc"/> + <include name="${target.name.no.version}"/> </fileset> </delete> <delete failonerror="false"> - <fileset dir="${basedir}/js/out"> + <fileset dir="${basedir}/target"> <include name="**/**"/> </fileset> </delete> @@ -63,40 +62,41 @@ </path> <target name="compile" description="Compiles .as files into .swc"> - <echo message="Compiling libs/HTML.swc"/> + <echo message="Compiling target/${target.name}"/> <echo message="FLEX_HOME: ${FLEX_HOME}"/> <echo message="FALCON_HOME: ${FALCON_HOME}"/> <!-- make JS output folder now so include-file doesn't error --> - <mkdir dir="${basedir}/js/out" /> - + <mkdir dir="${basedir}/target/generated-sources/flexjs"/> + <!-- Load the <compc> 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" classpathref="lib.path"/> <!-- - Link in the classes (and their dependencies) for the MXML tags - listed in this project's manifest.xml. - Also link the additional classes (and their dependencies) - listed in HTMLClasses.as, - because these aren't referenced by the manifest classes. - Keep the standard metadata when compiling. - Include the appropriate CSS files and assets in the SWC. - Don't include any resources in the SWC. - Write a bundle list of referenced resource bundles - into the file bundles.properties in this directory. - --> + Link in the classes (and their dependencies) for the MXML tags + listed in this project's manifest.xml. + Also link the additional classes (and their dependencies) + listed in CoreClasses.as, + because these aren't referenced by the manifest classes. + Keep the standard metadata when compiling. + Include the appropriate CSS files and assets in the SWC. + Don't include any resources in the SWC. + Write a bundle list of referenced resource bundles + into the file bundles.properties in this directory. + --> <compc fork="true" - output="${FLEXJS_HOME}/frameworks/libs/HTML.swc"> + output="${basedir}/target/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="compile-config.xml" /> + <load-config filename="${basedir}/src/main/resources/compile-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-define=COMPILE::AS3,true" /> <arg value="-define=COMPILE::JS,false" /> </compc> + <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name.no.version}" /> </target> - <target name="compile-asjs" > - <echo message="Cross-compiling HTML/asjs"/> + <target name="compile-asjs"> + <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" > <jvmarg value="-Xmx384m" /> @@ -106,8 +106,8 @@ <arg value="+flexlib=${FLEX_HOME}/frameworks" /> <arg value="-js-output-type=FLEXJS" /> <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${basedir}/js/out" /> - <arg value="-load-config=${basedir}/compile-asjs-config.xml" /> + <arg value="-output=${basedir}/target/generated-sources/flexjs" /> + <arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> @@ -120,11 +120,12 @@ </target> <target name="compile-extern-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling externs/HTML.swc"/> + <echo message="Compiling target/externs/${target.name}"/> <echo message="FLEX_HOME: ${FLEX_HOME}"/> <echo message="FALCON_HOME: ${FALCON_HOME}"/> <!-- make JS output folder now so include-file doesn't error --> <mkdir dir="${FLEXJS_HOME}/frameworks/externs"/> + <mkdir dir="${basedir}/target/externs"/> <!-- Load the <compc> task. We can't do this at the <project> level --> <!-- because targets that run before flexTasks.jar gets built would fail. --> @@ -142,9 +143,9 @@ into the file bundles.properties in this directory. --> <compc fork="true" - output="${FLEXJS_HOME}/frameworks/externs/HTML.swc"> + output="${basedir}/target/externs/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="compile-asjs-config.xml" /> + <load-config filename="src/main/resources/compile-asjs-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> @@ -153,14 +154,16 @@ <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </compc> + <copy file="${basedir}/target/externs/${target.name}" tofile="${FLEXJS_HOME}/frameworks/externs/${target.name.no.version}" /> </target> - <target name="copy-js" > + <target name="copy-js"> <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"> - <fileset dir="${basedir}/js/out"> - <include name="**/**" /> + <fileset dir="${basedir}/target/generated-sources/flexjs"> + <include name="**/**"/> </fileset> </copy> </target> + </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/980ee4da/frameworks/projects/HTML/src/main/resources/compile-asjs-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/resources/compile-asjs-config.xml b/frameworks/projects/HTML/src/main/resources/compile-asjs-config.xml index 2139379..b578f84 100644 --- a/frameworks/projects/HTML/src/main/resources/compile-asjs-config.xml +++ b/frameworks/projects/HTML/src/main/resources/compile-asjs-config.xml @@ -45,10 +45,10 @@ <!-- asjscompc won't 'link' these classes in, but will list their requires if these swcs are on the external-library-path then their requires will not be listed --> - <path-element>../../externs/Binding.swc</path-element> - <path-element>../../externs/Core.swc</path-element> - <path-element>../../externs/Graphics.swc</path-element> - <path-element>../../externs/Collections.swc</path-element> + <path-element>../../../../../externs/Binding.swc</path-element> + <path-element>../../../../../externs/Core.swc</path-element> + <path-element>../../../../../externs/Graphics.swc</path-element> + <path-element>../../../../../externs/Collections.swc</path-element> </library-path> <namespaces> @@ -63,7 +63,7 @@ </namespaces> <source-path> - <path-element>as/src</path-element> + <path-element>../flex</path-element> </source-path> <warn-no-constructor>false</warn-no-constructor> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/980ee4da/frameworks/projects/HTML/src/main/resources/compile-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/resources/compile-config.xml b/frameworks/projects/HTML/src/main/resources/compile-config.xml index 7ea999a..7f2b812 100644 --- a/frameworks/projects/HTML/src/main/resources/compile-config.xml +++ b/frameworks/projects/HTML/src/main/resources/compile-config.xml @@ -23,10 +23,10 @@ <external-library-path> <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> - <path-element>../../libs/Binding.swc</path-element> - <path-element>../../libs/Core.swc</path-element> - <path-element>../../libs/Graphics.swc</path-element> - <path-element>../../libs/Collections.swc</path-element> + <path-element>../../../../../libs/Binding.swc</path-element> + <path-element>../../../../../libs/Core.swc</path-element> + <path-element>../../../../../libs/Graphics.swc</path-element> + <path-element>../../../../../libs/Collections.swc</path-element> </external-library-path> <mxml> @@ -64,7 +64,7 @@ </namespaces> <source-path> - <path-element>as/src</path-element> + <path-element>../flex</path-element> </source-path> <warn-no-constructor>false</warn-no-constructor> @@ -72,11 +72,11 @@ <include-file> <name>defaults.css</name> - <path>as/defaults.css</path> + <path>defaults.css</path> </include-file> <include-file> <name>js/out/*</name> - <path>js/out/*</path> + <path>../../../target/generated-sources/flexjs/*</path> </include-file> <include-classes> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/980ee4da/frameworks/projects/HTML/src/test/flex/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/test/flex/build.xml b/frameworks/projects/HTML/src/test/flex/build.xml index fda6c62..599d96d 100644 --- a/frameworks/projects/HTML/src/test/flex/build.xml +++ b/frameworks/projects/HTML/src/test/flex/build.xml @@ -20,13 +20,14 @@ <project name="HTML.test" default="main" basedir="."> - <property name="FLEXJS_HOME" location="../../../../.."/> + <property name="FLEXJS_HOME" location="../../../../../.."/> <property file="${FLEXJS_HOME}/env.properties"/> <property environment="env"/> <property file="${FLEXJS_HOME}/build.properties"/> <property name="FLEX_HOME" value="${env.FLEX_HOME}"/> <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> + <property name="target.name" value="Core-${release.version}.swc" /> <condition property="browser" value="C:/Program Files/Internet Explorer/iexplore.exe"> <os family="windows"/> @@ -70,7 +71,7 @@ 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 name="main" depends="clean,compile,test" description="Clean test of ${target.name}"> </target> <target name="clean"> @@ -79,6 +80,11 @@ <include name="FlexUnitFlexJSApplication.swf"/> </fileset> </delete> + <delete failonerror="false"> + <fileset dir="${basedir}/bin"> + <include name="**/**"/> + </fileset> + </delete> </target> <path id="lib.path"> @@ -119,7 +125,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="-source-path+=${FLEXJS_HOME}/frameworks/projects/HTML/as/src" /> + <arg value="-source-path+=${FLEXJS_HOME}/frameworks/projects/HTML/src/main/flex" /> <arg value="-library-path+=${FLEXJS_HOME}/frameworks/libs" /> <arg value="${FLEXUNIT_LIBPATH1}" /> <arg value="${FLEXUNIT_LIBPATH2}" /> @@ -143,7 +149,7 @@ verbose="true" localTrusted="true" timeout="90000"> - <source dir="${FLEXJS_HOME}/frameworks/projects/HTML/as/src" /> + <source dir="${FLEXJS_HOME}/frameworks/projects/HTML/src/main/flex" /> <library dir="${FLEXJS_HOME}/frameworks/libs" /> </flexunit>
