You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ha...@apache.org on 2016/02/11 10:10:54 UTC
[24/51] [abbrv] git commit: [flex-asjs] [refs/heads/e4x] - fix
scripts after folder change
fix scripts after folder change
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/693d2839
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/693d2839
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/693d2839
Branch: refs/heads/e4x
Commit: 693d28394984af2f523123d4c1bf7c8189893990
Parents: 1bfcf5d
Author: Alex Harui <ah...@apache.org>
Authored: Tue Feb 2 21:27:31 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Feb 3 10:01:52 2016 -0800
----------------------------------------------------------------------
frameworks/projects/HTML5/build.xml | 65 +++++++++++---------
.../src/main/resources/compile-asjs-config.xml | 8 +--
.../HTML5/src/main/resources/compile-config.xml | 10 +--
3 files changed, 44 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/693d2839/frameworks/projects/HTML5/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML5/build.xml b/frameworks/projects/HTML5/build.xml
index 1b1d27d..447af25 100644
--- a/frameworks/projects/HTML5/build.xml
+++ b/frameworks/projects/HTML5/build.xml
@@ -28,6 +28,8 @@
<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="HTML5-${release.version}.swc" />
+ <property name="target.name.no.version" value="HTML5.swc" />
<target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of HTML5.swc">
</target>
@@ -41,55 +43,56 @@
<target name="clean">
<delete failonerror="false">
<fileset dir="${FLEXJS_HOME}/frameworks/libs">
- <include name="HTML5.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>
</target>
<path id="lib.path">
- <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
+ <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
-
+
<target name="compile" description="Compiles .as files into .swc">
- <echo message="Compiling libs/HTML5.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 ChartsClasses.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/HTML5.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 HTML5"/>
+ <echo message="Cross-compiling ${target.name}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
@@ -99,8 +102,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}" />
@@ -111,13 +114,14 @@
<arg value="-define=COMPILE::JS,true" />
</java>
</target>
-
+
<target name="compile-extern-swc" description="Compiles .as files into .swc used for cross-compiling other projects">
- <echo message="Compiling externs/HTML5.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. -->
@@ -135,9 +139,9 @@
into the file bundles.properties in this directory.
-->
<compc fork="true"
- output="${FLEXJS_HOME}/frameworks/externs/HTML5.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" />
@@ -146,11 +150,12 @@
<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">
<copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
- <fileset dir="${basedir}/js/out">
+ <fileset dir="${basedir}/target/generated-sources/flexjs">
<include name="**/**"/>
</fileset>
</copy>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/693d2839/frameworks/projects/HTML5/src/main/resources/compile-asjs-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML5/src/main/resources/compile-asjs-config.xml b/frameworks/projects/HTML5/src/main/resources/compile-asjs-config.xml
index 0e2439c..c3db508 100644
--- a/frameworks/projects/HTML5/src/main/resources/compile-asjs-config.xml
+++ b/frameworks/projects/HTML5/src/main/resources/compile-asjs-config.xml
@@ -45,19 +45,19 @@
<!-- 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/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>
<source-path>
- <path-element>as/src</path-element>
+ <path-element>../flex</path-element>
</source-path>
<warn-no-constructor>false</warn-no-constructor>
</compiler>
<include-sources>
- <path-element>as/src</path-element>
+ <path-element>../flex</path-element>
</include-sources>
<include-namespaces>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/693d2839/frameworks/projects/HTML5/src/main/resources/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML5/src/main/resources/compile-config.xml b/frameworks/projects/HTML5/src/main/resources/compile-config.xml
index f2ece61..75d4ef8 100644
--- a/frameworks/projects/HTML5/src/main/resources/compile-config.xml
+++ b/frameworks/projects/HTML5/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>