fix scripts after folder changes
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/038a40e5 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/038a40e5 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/038a40e5 Branch: refs/heads/mavenfolders Commit: 038a40e5dfaad7de01e6eb100ed49b5a8ba5f67a Parents: 658b34b Author: Alex Harui <aha...@apache.org> Authored: Tue Feb 2 16:42:08 2016 -0800 Committer: Alex Harui <aha...@apache.org> Committed: Tue Feb 2 16:42:08 2016 -0800 ---------------------------------------------------------------------- frameworks/projects/CreateJS/build.xml | 61 +++++++++++--------- .../src/main/resources/compile-asjs-config.xml | 6 +- .../src/main/resources/compile-config.xml | 10 ++-- 3 files changed, 42 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/038a40e5/frameworks/projects/CreateJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/build.xml b/frameworks/projects/CreateJS/build.xml index b121239..eb84ec2 100644 --- a/frameworks/projects/CreateJS/build.xml +++ b/frameworks/projects/CreateJS/build.xml @@ -31,6 +31,8 @@ <condition property="no.lint" value="true"> <os family="windows"/> </condition> + <property name="target.name" value="CreateJS-${release.version}.swc" /> + <property name="target.name.no.version" value="CreateJS.swc" /> <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of CreateJS.swc"> </target> @@ -50,11 +52,11 @@ <target name="clean"> <delete failonerror="false"> <fileset dir="${FLEXJS_HOME}/frameworks/libs"> - <include name="CreateJS.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> @@ -65,38 +67,41 @@ </path> <target name="compile" description="Compiles .as files into .swc"> - <echo message="Compiling libs/CreateJS.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}/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 CreateJSClasses.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/CreateJS.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 CreateJS"/> + <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 +111,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}" /> @@ -121,11 +126,12 @@ </target> <target name="compile-extern-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling externs/CreateJS.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. --> @@ -143,9 +149,9 @@ into the file bundles.properties in this directory. --> <compc fork="true" - output="${FLEXJS_HOME}/frameworks/externs/CreateJS.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" /> @@ -155,12 +161,13 @@ <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> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/038a40e5/frameworks/projects/CreateJS/src/main/resources/compile-asjs-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/resources/compile-asjs-config.xml b/frameworks/projects/CreateJS/src/main/resources/compile-asjs-config.xml index 35c65b3..cd48012 100644 --- a/frameworks/projects/CreateJS/src/main/resources/compile-asjs-config.xml +++ b/frameworks/projects/CreateJS/src/main/resources/compile-asjs-config.xml @@ -52,12 +52,12 @@ </namespaces> <source-path> - <path-element>as/src</path-element> + <path-element>../flex</path-element> </source-path> <library-path> - <path-element>../../externs/Core.swc</path-element> - <path-element>../../externs/HTML.swc</path-element> + <path-element>../../../../../externs/Core.swc</path-element> + <path-element>../../../../../externs/HTML.swc</path-element> </library-path> <warn-no-constructor>false</warn-no-constructor> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/038a40e5/frameworks/projects/CreateJS/src/main/resources/compile-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/resources/compile-config.xml b/frameworks/projects/CreateJS/src/main/resources/compile-config.xml index 3aecfb2..46f455d 100644 --- a/frameworks/projects/CreateJS/src/main/resources/compile-config.xml +++ b/frameworks/projects/CreateJS/src/main/resources/compile-config.xml @@ -23,8 +23,8 @@ <external-library-path> <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> - <path-element>../../libs/Core.swc</path-element> - <path-element>../../libs/HTML.swc</path-element> + <path-element>../../../../../libs/Core.swc</path-element> + <path-element>../../../../../libs/HTML.swc</path-element> </external-library-path> <mxml> @@ -54,7 +54,7 @@ </namespaces> <source-path> - <path-element>as/src</path-element> + <path-element>../flex</path-element> </source-path> <warn-no-constructor>false</warn-no-constructor> @@ -62,11 +62,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>
