You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2016/05/11 17:42:21 UTC
[5/6] git commit: [flex-asjs] [refs/heads/ide-projects] - fix up
build now that JS is built from separate projecct folders
fix up build now that JS is built from separate projecct folders
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2b3e8399
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2b3e8399
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2b3e8399
Branch: refs/heads/ide-projects
Commit: 2b3e8399af81f005e27f9d06a3e4fcee85379f0c
Parents: 1efef7b
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 11 10:13:35 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 11 10:13:35 2016 -0700
----------------------------------------------------------------------
frameworks/projects/CreateJS/build.xml | 93 +-------------------
.../src/main/config/compile-as-config.xml | 2 +-
frameworks/projects/DragDrop/build.xml | 85 +-----------------
.../src/main/config/compile-as-config.xml | 2 +-
frameworks/projects/Effects/build.xml | 84 +-----------------
.../src/main/config/compile-as-config.xml | 2 +-
frameworks/projects/Flat/build.xml | 84 +-----------------
.../Flat/src/main/config/compile-as-config.xml | 2 +-
frameworks/projects/Formatters/build.xml | 84 +-----------------
.../src/main/config/compile-as-config.xml | 2 +-
frameworks/projects/GoogleMaps/build.xml | 89 +------------------
.../src/main/config/compile-as-config.xml | 2 +-
frameworks/projects/HTML5/build.xml | 84 +-----------------
.../HTML5/src/main/config/compile-as-config.xml | 2 +-
frameworks/projects/JQuery/build.xml | 90 +------------------
.../src/main/config/compile-as-config.xml | 2 +-
frameworks/projects/Mobile/build.xml | 84 +-----------------
.../src/main/config/compile-as-config.xml | 2 +-
frameworks/projects/Network/build.xml | 84 +-----------------
.../src/main/config/compile-as-config.xml | 2 +-
frameworks/projects/Reflection/build.xml | 84 +-----------------
.../src/main/config/compile-as-config.xml | 2 +-
frameworks/projects/Storage/build.xml | 90 +------------------
.../src/main/config/compile-as-config.xml | 2 +-
frameworks/projects/XML/build.xml | 80 +----------------
.../XML/src/main/config/compile-as-config.xml | 2 +-
26 files changed, 39 insertions(+), 1102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/CreateJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/build.xml b/frameworks/projects/CreateJS/build.xml
index 4739c9e..b5fb559 100644
--- a/frameworks/projects/CreateJS/build.xml
+++ b/frameworks/projects/CreateJS/build.xml
@@ -27,26 +27,10 @@
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
- <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
- <condition property="CREATEJS.SWC" value="${FALCONJX_HOME}/../js/libs/createjs.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/createjs.swc" />
- </condition>
- <property name="CREATEJS.SWC" value="${FALCONJX_HOME}/../externs/createjs/target/createjs.swc" />
- <condition property="no.lint" value="true">
- <os family="windows"/>
- </condition>
- <property name="target.name" value="CreateJS-${release.version}.swc" />
+ <property name="target.name" value="CreateJS.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 name="main" depends="clean,compile,test" description="Full build of CreateJS.swc">
</target>
<target name="test" unless="is.jenkins">
@@ -112,77 +96,4 @@
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name.no.version}" />
</target>
- <target name="compile-asjs">
- <echo message="Cross-compiling ${target.name}"/>
- <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
- <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
- <jvmarg value="-Xmx384m" />
- <jvmarg value="-Dsun.io.useCanonCaches=false" />
- <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
- <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
- <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}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <arg value="-external-library-path+=${CREATEJS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <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 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. -->
- <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 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="${basedir}/target/externs/${target.name}">
- <jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <arg value="-external-library-path+=${CREATEJS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <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}/target/generated-sources/flexjs">
- <include name="**/**"/>
- </fileset>
- </copy>
- </target>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/CreateJS/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/src/main/config/compile-as-config.xml b/frameworks/projects/CreateJS/src/main/config/compile-as-config.xml
index 2c172b0..1712b69 100644
--- a/frameworks/projects/CreateJS/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/CreateJS/src/main/config/compile-as-config.xml
@@ -67,7 +67,7 @@
</include-file>
<include-file>
<name>js/out/*</name>
- <path>../../../target/generated-sources/flexjs/*</path>
+ <path>../../../../../js/FlexJS/projects/CreateJS/target/generated-sources/flexjs/*</path>
</include-file>
<include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/DragDrop/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/build.xml b/frameworks/projects/DragDrop/build.xml
index bb4cc18..a18158e 100644
--- a/frameworks/projects/DragDrop/build.xml
+++ b/frameworks/projects/DragDrop/build.xml
@@ -27,20 +27,11 @@
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
- <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
- <property name="target.name" value="DragDrop-${release.version}.swc" />
+ <property name="target.name" value="DragDrop.swc" />
<property name="target.name.no.version" value="DragDrop.swc" />
- <target name="main" depends="clean,compile-asjs,compile-extern-swc,compile" description="Full build of DragDrop.swc">
+ <target name="main" depends="clean,compile" description="Full build of DragDrop.swc">
</target>
<target name="test" unless="is.jenkins">
@@ -107,76 +98,4 @@
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name.no.version}" />
</target>
- <target name="compile-asjs">
- <echo message="Cross-compiling ${target.name}"/>
- <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
- <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
- <jvmarg value="-Xmx384m" />
- <jvmarg value="-Dsun.io.useCanonCaches=false" />
- <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
- <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
- <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}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <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 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. -->
- <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 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="${basedir}/target/externs/${target.name}">
- <jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <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}/target/generated-sources/flexjs">
- <include name="**/**"/>
- </fileset>
- </copy>
- </target>
-
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/DragDrop/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/src/main/config/compile-as-config.xml b/frameworks/projects/DragDrop/src/main/config/compile-as-config.xml
index 63f3fee..e90be35 100644
--- a/frameworks/projects/DragDrop/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/DragDrop/src/main/config/compile-as-config.xml
@@ -61,7 +61,7 @@
<include-file>
<name>js/out/*</name>
- <path>../../../target/generated-sources/flexjs/*</path>
+ <path>../../../../../js/FlexJS/projects/DragDrop/target/generated-sources/flexjs/*</path>
</include-file>
<include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/Effects/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/build.xml b/frameworks/projects/Effects/build.xml
index a697d09..c2fbeff 100644
--- a/frameworks/projects/Effects/build.xml
+++ b/frameworks/projects/Effects/build.xml
@@ -27,20 +27,11 @@
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
- <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
- <property name="target.name" value="Effects-${release.version}.swc" />
+ <property name="target.name" value="Effects.swc" />
<property name="target.name.no.version" value="Effects.swc" />
- <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile" description="Full build of Effects.swc">
+ <target name="main" depends="clean,compile" description="Full build of Effects.swc">
</target>
<target name="test" unless="is.jenkins">
@@ -108,75 +99,4 @@
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name.no.version}" />
</target>
- <target name="compile-asjs">
- <echo message="Cross-compiling ${target.name}"/>
- <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
- <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
- <jvmarg value="-Xmx384m" />
- <jvmarg value="-Dsun.io.useCanonCaches=false" />
- <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
- <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
- <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}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <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 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. -->
- <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 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="${basedir}/target/externs/${target.name}">
- <jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <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}/target/generated-sources/flexjs">
- <include name="**/**"/>
- </fileset>
- </copy>
- </target>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/Effects/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/src/main/config/compile-as-config.xml b/frameworks/projects/Effects/src/main/config/compile-as-config.xml
index f099e6e..65ccf16 100644
--- a/frameworks/projects/Effects/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Effects/src/main/config/compile-as-config.xml
@@ -61,7 +61,7 @@
<include-file>
<name>js/out/*</name>
- <path>../../../target/generated-sources/flexjs/*</path>
+ <path>../../../../../js/FlexJS/projects/Effects/target/generated-sources/flexjs/*</path>
</include-file>
<include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/Flat/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/build.xml b/frameworks/projects/Flat/build.xml
index 5890744..752eab4 100644
--- a/frameworks/projects/Flat/build.xml
+++ b/frameworks/projects/Flat/build.xml
@@ -27,20 +27,11 @@
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
- <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
- <property name="target.name" value="Flat-${release.version}.swc" />
+ <property name="target.name" value="Flat.swc" />
<property name="target.name.no.version" value="Flat.swc" />
- <target name="main" depends="clean,compile-asjs,compile-extern-swc,compile,copy-js,test" description="Full build of Flat.swc">
+ <target name="main" depends="clean,compile,test" description="Full build of Flat.swc">
</target>
<target name="test" unless="is.jenkins">
@@ -107,75 +98,4 @@
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name.no.version}" />
</target>
- <target name="compile-asjs">
- <echo message="Cross-compiling ${target.name}"/>
- <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
- <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
- <jvmarg value="-Xmx384m" />
- <jvmarg value="-Dsun.io.useCanonCaches=false" />
- <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
- <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
- <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}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <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 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. -->
- <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 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="${basedir}/target/externs/${target.name}">
- <jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <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}/target/generated-sources/flexjs">
- <include name="**/**"/>
- </fileset>
- </copy>
- </target>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/Flat/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/src/main/config/compile-as-config.xml b/frameworks/projects/Flat/src/main/config/compile-as-config.xml
index 5fc5f22..6aa4991 100644
--- a/frameworks/projects/Flat/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Flat/src/main/config/compile-as-config.xml
@@ -74,7 +74,7 @@
</include-file>
<include-file>
<name>js/out/*</name>
- <path>../../../target/generated-sources/flexjs/*</path>
+ <path>../../../../../js/FlexJS/projects/Flat/target/generated-sources/flexjs/*</path>
</include-file>
<include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/Formatters/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Formatters/build.xml b/frameworks/projects/Formatters/build.xml
index 6b88088..fd83374 100644
--- a/frameworks/projects/Formatters/build.xml
+++ b/frameworks/projects/Formatters/build.xml
@@ -27,19 +27,10 @@
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
- <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
- <property name="target.name" value="Formatters-${release.version}.swc" />
+ <property name="target.name" value="Formatters.swc" />
<property name="target.name.no.version" value="Formatters.swc" />
- <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of Formatters.swc">
+ <target name="main" depends="clean,compile,test" description="Full build of Formatters.swc">
</target>
<target name="test" unless="is.jenkins">
@@ -99,75 +90,4 @@
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name.no.version}" />
</target>
- <target name="compile-asjs">
- <echo message="Cross-compiling ${target.name}"/>
- <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
- <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
- <jvmarg value="-Xmx384m" />
- <jvmarg value="-Dsun.io.useCanonCaches=false" />
- <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
- <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
- <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}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <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 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. -->
- <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 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="${basedir}/target/externs/${target.name}">
- <jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <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}/target/generated-sources/flexjs">
- <include name="**/**"/>
- </fileset>
- </copy>
- </target>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/Formatters/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Formatters/src/main/config/compile-as-config.xml b/frameworks/projects/Formatters/src/main/config/compile-as-config.xml
index a9efef9..36a2632 100644
--- a/frameworks/projects/Formatters/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Formatters/src/main/config/compile-as-config.xml
@@ -62,7 +62,7 @@
<include-file>
<name>js/out/*</name>
- <path>../../../target/generated-sources/flexjs/*</path>
+ <path>../../../../../js/FlexJS/projects/Formatters/target/generated-sources/flexjs/*</path>
</include-file>
<include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/GoogleMaps/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/build.xml b/frameworks/projects/GoogleMaps/build.xml
index b8e9aaf..28d8486 100644
--- a/frameworks/projects/GoogleMaps/build.xml
+++ b/frameworks/projects/GoogleMaps/build.xml
@@ -27,23 +27,10 @@
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
- <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
- <condition property="GOOGLEMAPS.SWC" value="${FALCONJX_HOME}/../js/libs/google_maps.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/google_maps.swc" />
- </condition>
- <property name="GOOGLEMAPS.SWC" value="${FALCONJX_HOME}/../externs/google_maps/target/google_maps.swc" />
- <property name="target.name" value="GoogleMaps-${release.version}.swc" />
+ <property name="target.name" value="GoogleMaps.swc" />
<property name="target.name.no.version" value="GoogleMaps.swc" />
- <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of GoogleMaps.swc">
+ <target name="main" depends="clean,compile,test" description="Full build of GoogleMaps.swc">
</target>
<target name="test" unless="is.jenkins">
@@ -103,77 +90,5 @@
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name.no.version}" />
</target>
- <target name="compile-asjs">
- <echo message="Cross-compiling ${target.name}"/>
- <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
- <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
- <jvmarg value="-Xmx384m" />
- <jvmarg value="-Dsun.io.useCanonCaches=false" />
- <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
- <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
- <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}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <arg value="-external-library-path+=${GOOGLEMAPS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <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 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. -->
- <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 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="${basedir}/target/externs/${target.name}">
- <jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <arg value="-external-library-path+=${GOOGLEMAPS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <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}/target/generated-sources/flexjs">
- <include name="**/**"/>
- </fileset>
- </copy>
- </target>
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml b/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml
index 9d5d979..f5d61f7 100644
--- a/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml
@@ -65,7 +65,7 @@
</include-file>
<include-file>
<name>js/out/*</name>
- <path>../../../target/generated-sources/flexjs/*</path>
+ <path>../../../../../js/FlexJS/projects/GoogleMaps/target/generated-sources/flexjs/*</path>
</include-file>
<include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/HTML5/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML5/build.xml b/frameworks/projects/HTML5/build.xml
index e917402..8ab9958 100644
--- a/frameworks/projects/HTML5/build.xml
+++ b/frameworks/projects/HTML5/build.xml
@@ -27,19 +27,10 @@
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
- <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
- <property name="target.name" value="HTML5-${release.version}.swc" />
+ <property name="target.name" value="HTML5.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 name="main" depends="clean,compile,test" description="Full build of HTML5.swc">
</target>
<target name="test" unless="is.jenkins">
@@ -98,76 +89,5 @@
</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 ${target.name}"/>
- <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
- <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
- <jvmarg value="-Xmx384m" />
- <jvmarg value="-Dsun.io.useCanonCaches=false" />
- <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
- <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
- <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}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <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 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. -->
- <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 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="${basedir}/target/externs/${target.name}">
- <jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <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}/target/generated-sources/flexjs">
- <include name="**/**"/>
- </fileset>
- </copy>
- </target>
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/HTML5/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML5/src/main/config/compile-as-config.xml b/frameworks/projects/HTML5/src/main/config/compile-as-config.xml
index 74776bf..0a4980f 100644
--- a/frameworks/projects/HTML5/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/HTML5/src/main/config/compile-as-config.xml
@@ -66,7 +66,7 @@
</include-file>
<include-file>
<name>js/out/*</name>
- <path>../../../target/generated-sources/flexjs/*</path>
+ <path>../../../../../js/FlexJS/projects/HTML5/target/generated-sources/flexjs/*</path>
</include-file>
<include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/JQuery/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/JQuery/build.xml b/frameworks/projects/JQuery/build.xml
index d537af2..3275373 100644
--- a/frameworks/projects/JQuery/build.xml
+++ b/frameworks/projects/JQuery/build.xml
@@ -27,23 +27,10 @@
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
- <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
- <condition property="JQUERY.SWC" value="${FALCONJX_HOME}/../js/libs/jquery.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/jquery.swc" />
- </condition>
- <property name="JQUERY.SWC" value="${FALCONJX_HOME}/../externs/jquery/target/jquery-1.9.swc" />
- <property name="target.name" value="JQuery-${release.version}.swc" />
+ <property name="target.name" value="JQuery.swc" />
<property name="target.name.no.version" value="JQuery.swc" />
- <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of jQuery.swc">
+ <target name="main" depends="clean,compile,test" description="Full build of jQuery.swc">
</target>
<target name="test" unless="is.jenkins">
@@ -103,77 +90,4 @@
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name.no.version}" />
</target>
- <target name="compile-asjs">
- <echo message="Cross-compiling ${target.name}"/>
- <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
- <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
- <jvmarg value="-Xmx384m" />
- <jvmarg value="-Dsun.io.useCanonCaches=false" />
- <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
- <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
- <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}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <arg value="-external-library-path+=${JQUERY.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <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 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. -->
- <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 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="${basedir}/target/externs/${target.name}">
- <jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <arg value="-external-library-path+=${JQUERY.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <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}/target/generated-sources/flexjs">
- <include name="**/**"/>
- </fileset>
- </copy>
- </target>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/JQuery/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/JQuery/src/main/config/compile-as-config.xml b/frameworks/projects/JQuery/src/main/config/compile-as-config.xml
index 94e3423..868c88f 100644
--- a/frameworks/projects/JQuery/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/JQuery/src/main/config/compile-as-config.xml
@@ -66,7 +66,7 @@
</include-file>
<include-file>
<name>js/out/*</name>
- <path>../../../target/generated-sources/flexjs/*</path>
+ <path>../../../../../js/FlexJS/projects/JQuery/target/generated-sources/flexjs/*</path>
</include-file>
<include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/Mobile/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/build.xml b/frameworks/projects/Mobile/build.xml
index 1b5bd21..50e713c 100644
--- a/frameworks/projects/Mobile/build.xml
+++ b/frameworks/projects/Mobile/build.xml
@@ -27,19 +27,10 @@
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
- <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
- <property name="target.name" value="Mobile-${release.version}.swc" />
+ <property name="target.name" value="Mobile.swc" />
<property name="target.name.no.version" value="Mobile.swc" />
- <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of Mobile.swc">
+ <target name="main" depends="clean,compile,test" description="Full build of Mobile.swc">
</target>
<target name="test" unless="is.jenkins">
@@ -98,76 +89,5 @@
</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 ${target.name}"/>
- <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
- <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
- <jvmarg value="-Xmx384m" />
- <jvmarg value="-Dsun.io.useCanonCaches=false" />
- <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
- <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
- <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}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <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 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. -->
- <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 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="${basedir}/target/externs/${target.name}">
- <jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <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}/target/generated-sources/flexjs">
- <include name="**/**"/>
- </fileset>
- </copy>
- </target>
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/Mobile/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/config/compile-as-config.xml b/frameworks/projects/Mobile/src/main/config/compile-as-config.xml
index 36f1c2c..3906f32 100644
--- a/frameworks/projects/Mobile/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Mobile/src/main/config/compile-as-config.xml
@@ -71,7 +71,7 @@
</include-file>
<include-file>
<name>js/out/*</name>
- <path>../../../target/generated-sources/flexjs/*</path>
+ <path>../../../../../js/FlexJS/projects/Mobile/target/generated-sources/flexjs/*</path>
</include-file>
<include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/Network/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Network/build.xml b/frameworks/projects/Network/build.xml
index afa3440..13c4b7c 100644
--- a/frameworks/projects/Network/build.xml
+++ b/frameworks/projects/Network/build.xml
@@ -27,19 +27,10 @@
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
- <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
- <property name="target.name" value="Network-${release.version}.swc" />
+ <property name="target.name" value="Network.swc" />
<property name="target.name.no.version" value="Network.swc" />
- <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile" description="Full build of Network.swc">
+ <target name="main" depends="clean,compile" description="Full build of Network.swc">
</target>
<target name="test" unless="is.jenkins">
@@ -104,76 +95,5 @@
</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 ${target.name}"/>
- <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
- <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
- <jvmarg value="-Xmx384m" />
- <jvmarg value="-Dsun.io.useCanonCaches=false" />
- <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
- <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
- <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}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <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 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. -->
- <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 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="${basedir}/target/externs/${target.name}">
- <jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <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}/target/generated-sources/flexjs">
- <include name="**/**"/>
- </fileset>
- </copy>
- </target>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/Network/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Network/src/main/config/compile-as-config.xml b/frameworks/projects/Network/src/main/config/compile-as-config.xml
index ef4550b..82e31a0 100644
--- a/frameworks/projects/Network/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Network/src/main/config/compile-as-config.xml
@@ -61,7 +61,7 @@
<include-file>
<name>js/out/*</name>
- <path>../../../target/generated-sources/flexjs/*</path>
+ <path>../../../../../js/FlexJS/projects/Network/target/generated-sources/flexjs/*</path>
</include-file>
<include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/Reflection/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Reflection/build.xml b/frameworks/projects/Reflection/build.xml
index c75cd4e..60618e1 100644
--- a/frameworks/projects/Reflection/build.xml
+++ b/frameworks/projects/Reflection/build.xml
@@ -27,19 +27,10 @@
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
- <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
- <property name="target.name" value="Reflection-${release.version}.swc" />
+ <property name="target.name" value="Reflection.swc" />
<property name="target.name.no.version" value="Reflection.swc" />
- <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of Reflection.swc">
+ <target name="main" depends="clean,compile,test" description="Full build of Reflection.swc">
</target>
<target name="test" unless="is.jenkins">
@@ -105,76 +96,5 @@
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name.no.version}" />
</target>
- <target name="compile-asjs">
- <echo message="Cross-compiling ${target.name}"/>
- <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
- <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
- <jvmarg value="-Xmx384m" />
- <jvmarg value="-Dsun.io.useCanonCaches=false" />
- <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
- <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
- <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}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <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 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. -->
- <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 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="${basedir}/target/externs/${target.name}">
- <jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <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}/target/generated-sources/flexjs">
- <include name="**/**"/>
- </fileset>
- </copy>
- </target>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/Reflection/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Reflection/src/main/config/compile-as-config.xml b/frameworks/projects/Reflection/src/main/config/compile-as-config.xml
index f2319c4..aaae549 100644
--- a/frameworks/projects/Reflection/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Reflection/src/main/config/compile-as-config.xml
@@ -57,7 +57,7 @@
<include-file>
<name>js/out/*</name>
- <path>../../../target/generated-sources/flexjs/*</path>
+ <path>../../../../../js/FlexJS/projects/Reflection/target/generated-sources/flexjs/*</path>
</include-file>
<!-- TODO: Why this? -->
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/Storage/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Storage/build.xml b/frameworks/projects/Storage/build.xml
index e7e0646..7470c82 100644
--- a/frameworks/projects/Storage/build.xml
+++ b/frameworks/projects/Storage/build.xml
@@ -27,23 +27,10 @@
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
- <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
- </condition>
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
- </condition>
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
- <condition property="CORDOVA.SWC" value="${FALCONJX_HOME}/../js/libs/cordova.swc" >
- <available file="${FALCONJX_HOME}/../js/libs/cordova.swc" />
- </condition>
- <property name="CORDOVA.SWC" value="${FALCONJX_HOME}/../externs/cordova/target/cordova.swc" />
- <property name="target.name" value="Storage-${release.version}.swc" />
+ <property name="target.name" value="Storage.swc" />
<property name="target.name.no.version" value="Storage.swc" />
- <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of Storage.swc">
+ <target name="main" depends="clean,compile,test" description="Full build of Storage.swc">
</target>
<target name="test" unless="is.jenkins">
@@ -109,77 +96,4 @@
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name.no.version}" />
</target>
- <target name="compile-asjs">
- <echo message="Cross-compiling ${target.name}"/>
- <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
- <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
- <jvmarg value="-Xmx384m" />
- <jvmarg value="-Dsun.io.useCanonCaches=false" />
- <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
- <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
- <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}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="--external-library-path+=${CORDOVA.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <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 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. -->
- <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 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="${basedir}/target/externs/${target.name}">
- <jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="--external-library-path+=${CORDOVA.SWC}" />
- <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}/target/generated-sources/flexjs">
- <include name="**/**"/>
- </fileset>
- </copy>
- </target>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/Storage/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Storage/src/main/config/compile-as-config.xml b/frameworks/projects/Storage/src/main/config/compile-as-config.xml
index 47046e2..4092759 100644
--- a/frameworks/projects/Storage/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Storage/src/main/config/compile-as-config.xml
@@ -65,7 +65,7 @@
</include-file>
<include-file>
<name>js/out/*</name>
- <path>../../../target/generated-sources/flexjs/*</path>
+ <path>../../../../../js/FlexJS/projects/Storage/target/generated-sources/flexjs/*</path>
</include-file>
<include-classes>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b3e8399/frameworks/projects/XML/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/build.xml b/frameworks/projects/XML/build.xml
index f62f2e3..1482547 100644
--- a/frameworks/projects/XML/build.xml
+++ b/frameworks/projects/XML/build.xml
@@ -28,9 +28,7 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<target name="more-props" >
- <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" />
- <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" />
- <property name="target.name" value="XML-${release.version}.swc" />
+ <property name="target.name" value="XML.swc" />
<property name="target.name.no.version" value="XML.swc" />
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
@@ -39,7 +37,7 @@
<!--<target name="main" depends="clean,check-falcon-home,check-falconjx-home,more-props,compile-asjs,compile-extern-swc,copy-js,compile,test-js" description="Full build of XML.swc">
</target>-->
- <target name="main" depends="clean,check-falcon-home,check-falconjx-home,more-props,compile-asjs,copy-js,compile,test-js" description="Full build of XML.swc">
+ <target name="main" depends="clean,check-falcon-home,check-falconjx-home,more-props,compile,test" description="Full build of XML.swc">
</target>
<target name="test" unless="is.jenkins">
@@ -101,78 +99,6 @@
<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name.no.version}" />
</target>
- <target name="compile-asjs">
- <echo message="Cross-compiling ${target.name}"/>
- <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
- <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
- <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
- <jvmarg value="-Xmx384m" />
- <jvmarg value="-Dsun.io.useCanonCaches=false" />
- <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
- <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
- <arg value="+flexlib=${FLEX_HOME}/frameworks" />
- <arg value="-js-output-type=FLEXJS" />
- <arg value="-compiler.strict-xml=true" />
- <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
- <arg value="-output=${basedir}/target/generated-sources/flexjs" />
- <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <arg value="-define=COMPILE::AS3,false" />
- <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 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. -->
- <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 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="${basedir}/target/externs/${target.name}">
- <jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path=${JS.SWC}" />
- <!-- this is not on external-library path otherwise goog.requires are not generated -->
- <arg value="-library-path+=${GCL.SWC}" />
- <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}/target/generated-sources/flexjs">
- <include name="**/**" />
- </fileset>
- </copy>
- </target>
-
<target name="check-falcon-home" unless="FALCON_HOME"
description="Check FALCON_HOME is a directory.">
@@ -210,8 +136,6 @@
<fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler.jx folder in flex-falcon repo or the js folder if it has been converted into an FB-compatible SDK"
unless="FALCONJX_HOME"/>
</target>
- <target name="asjs" depends="check-falcon-home,check-falconjx-home,more-props,compile-asjs">
- </target>
</project>