flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [1/2] git commit: [flex-asjs] [refs/heads/develop] - cross-compiled JS files now go into a subdir in the project and then into the SWC. They also get copied into frameworks/js/FlexJS/libs for now for backward compatibility and to make it faster to see c
Date Mon, 20 Apr 2015 17:32:14 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/develop 50889a818 -> eabf1d412


cross-compiled JS files now go into a subdir in the project and then into the SWC.  They also
get copied into frameworks/js/FlexJS/libs for now for backward compatibility and to make it
faster to see changes to JS files as you develop them.


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/eabf1d41
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/eabf1d41
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/eabf1d41

Branch: refs/heads/develop
Commit: eabf1d4129ef742e86fbbd87276c44443eb7db06
Parents: c889b40
Author: Alex Harui <aharui@apache.org>
Authored: Mon Apr 20 10:32:03 2015 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Apr 20 10:32:10 2015 -0700

----------------------------------------------------------------------
 frameworks/build.xml                             | 19 +++++++++++++++++++
 frameworks/projects/Binding/build.xml            |  8 ++++++--
 frameworks/projects/Binding/compile-config.xml   |  6 ++++++
 frameworks/projects/Charts/build.xml             |  8 ++++++--
 .../projects/Charts/compile-asjs-config.xml      |  3 ---
 frameworks/projects/Charts/compile-config.xml    |  8 ++++++++
 .../projects/Collections/compile-config.xml      |  2 ++
 frameworks/projects/Core/build.xml               |  8 ++++++--
 frameworks/projects/Core/compile-config.xml      |  6 ++++++
 frameworks/projects/CreateJS/compile-config.xml  |  4 ++++
 frameworks/projects/DragDrop/build.xml           |  8 ++++++--
 frameworks/projects/DragDrop/compile-config.xml  |  6 ++++++
 frameworks/projects/Effects/build.xml            |  8 ++++++--
 frameworks/projects/Effects/compile-config.xml   |  6 ++++++
 frameworks/projects/Formatters/build.xml         |  8 ++++++--
 .../projects/Formatters/compile-config.xml       |  6 ++++++
 .../projects/GoogleMaps/compile-config.xml       |  4 ++++
 frameworks/projects/Graphics/compile-config.xml  |  2 ++
 frameworks/projects/HTML/build.xml               |  8 ++++++--
 frameworks/projects/HTML/compile-config.xml      |  8 ++++++++
 frameworks/projects/HTML5/compile-config.xml     |  4 ++++
 frameworks/projects/JQuery/compile-config.xml    |  4 ++++
 frameworks/projects/Mobile/build.xml             |  8 ++++++--
 frameworks/projects/Mobile/compile-config.xml    |  6 ++++++
 frameworks/projects/Network/compile-config.xml   |  2 ++
 25 files changed, 141 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index dcfbcc2..654d6d6 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -130,6 +130,25 @@
         <ant dir="${basedir}/projects/Network" target="lint-js"/>
     </target>
 
+    <target name="re-compile" description="Builds all SWCs which should pick up the JS
files from asjs">
+        <!-- order may matter due to dependencies -->
+        <ant dir="${basedir}/projects/Core" target="compile"/>
+        <ant dir="${basedir}/projects/Graphics" target="compile"/>
+        <ant dir="${basedir}/projects/Binding" target="compile"/>
+        <ant dir="${basedir}/projects/HTML" target="compile"/>
+        <ant dir="${basedir}/projects/Charts" target="compile"/>
+        <ant dir="${basedir}/projects/Collections" target="compile"/>
+        <ant dir="${basedir}/projects/CreateJS" target="compile"/>
+        <ant dir="${basedir}/projects/DragDrop" target="compile"/>
+        <ant dir="${basedir}/projects/Effects" target="compile"/>
+        <ant dir="${basedir}/projects/Formatters" target="compile"/>
+        <ant dir="${basedir}/projects/GoogleMaps" target="compile"/>
+        <ant dir="${basedir}/projects/HTML5" target="compile"/>
+        <ant dir="${basedir}/projects/JQuery" target="compile"/>
+        <ant dir="${basedir}/projects/Mobile" target="compile"/>
+        <ant dir="${basedir}/projects/Network" target="compile"/>
+    </target>
+
     <target name="js" depends="compile-asjs, lint-js" />
     
     <target name="other.locales" description ="Builds resource SWCs for all locales">

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Binding/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/build.xml b/frameworks/projects/Binding/build.xml
index 5b3a23a..204b82a 100644
--- a/frameworks/projects/Binding/build.xml
+++ b/frameworks/projects/Binding/build.xml
@@ -68,6 +68,8 @@
         <echo message="Compiling libs/Binding.swc"/>
         <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" />
 
         <!-- Load the <compc> task. We can't do this at the <project> level
-->
         <!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -96,7 +98,6 @@
     <target name="compile-asjs" >
         <echo message="Cross-compiling Binding/asjs"/>
         <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
-        <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -105,7 +106,7 @@
             <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=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
+            <arg value="-output=${basedir}/js/out" />
             <arg value="-load-config=${basedir}/compile-asjs-config.xml" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
@@ -119,6 +120,9 @@
             <fileset dir="${basedir}/js/src">
                 <include name="**/**" />
             </fileset>
+            <fileset dir="${basedir}/js/out">
+                <include name="**/**" />
+            </fileset>
         </copy>
     </target>
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Binding/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/compile-config.xml b/frameworks/projects/Binding/compile-config.xml
index 12e20c9..b2a4c59 100644
--- a/frameworks/projects/Binding/compile-config.xml
+++ b/frameworks/projects/Binding/compile-config.xml
@@ -61,6 +61,12 @@
     </compiler>
     
     <include-file>
+        <name>js/out/*</name>
+        <path>js/out/*</path>
+    </include-file>
+    <include-file>
+        <name>js/src/*</name>
+        <path>js/src/*</path>
     </include-file>
 
     <include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Charts/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/build.xml b/frameworks/projects/Charts/build.xml
index 034c929..9461194 100644
--- a/frameworks/projects/Charts/build.xml
+++ b/frameworks/projects/Charts/build.xml
@@ -68,6 +68,8 @@
         <echo message="Compiling libs/Charts.swc"/>
         <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" />
 
         <!-- Load the <compc> task. We can't do this at the <project> level
-->
         <!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -96,7 +98,6 @@
     <target name="compile-asjs" >
         <echo message="Cross-compiling Charts/asjs"/>
         <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
-        <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -105,7 +106,7 @@
             <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=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
+            <arg value="-output=${basedir}/js/out" />
             <arg value="-load-config=${basedir}/compile-asjs-config.xml" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
@@ -119,6 +120,9 @@
             <fileset dir="${basedir}/js/src">
                 <include name="**/**" />
             </fileset>
+            <fileset dir="${basedir}/js/out">
+                <include name="**/**" />
+            </fileset>
         </copy>
     </target>
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Charts/compile-asjs-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/compile-asjs-config.xml b/frameworks/projects/Charts/compile-asjs-config.xml
index a89e04b..f82f1c7 100644
--- a/frameworks/projects/Charts/compile-asjs-config.xml
+++ b/frameworks/projects/Charts/compile-asjs-config.xml
@@ -55,9 +55,6 @@
         <warn-no-constructor>false</warn-no-constructor>
     </compiler>
     
-    <include-file>
-    </include-file>
-
     <include-sources>
         <path-element>asjs/src</path-element>
     </include-sources>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Charts/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/compile-config.xml b/frameworks/projects/Charts/compile-config.xml
index c8e301e..588688e 100644
--- a/frameworks/projects/Charts/compile-config.xml
+++ b/frameworks/projects/Charts/compile-config.xml
@@ -66,6 +66,14 @@
         <name>defaults.css</name>
         <path>asjs/defaults.css</path>
     </include-file>
+    <include-file>
+        <name>js/out/*</name>
+        <path>js/out/*</path>
+    </include-file>
+    <include-file>
+        <name>js/src/*</name>
+        <path>js/src/*</path>
+    </include-file>
 
     <include-classes>
         <class>ChartsClasses</class>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Collections/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/compile-config.xml b/frameworks/projects/Collections/compile-config.xml
index 57a6cdf..fdb1921 100644
--- a/frameworks/projects/Collections/compile-config.xml
+++ b/frameworks/projects/Collections/compile-config.xml
@@ -60,6 +60,8 @@
     </compiler>
     
     <include-file>
+        <name>js/src/*</name>
+        <path>js/src/*</path>
     </include-file>
 
     <include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Core/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/build.xml b/frameworks/projects/Core/build.xml
index 513f574..e7826a3 100644
--- a/frameworks/projects/Core/build.xml
+++ b/frameworks/projects/Core/build.xml
@@ -69,6 +69,8 @@
         <echo message="Compiling libs/Core.swc"/>
         <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" />
 
         <!-- Load the <compc> task. We can't do this at the <project> level
-->
         <!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -97,7 +99,6 @@
     <target name="compile-asjs" >
         <echo message="Cross-compiling Core/asjs"/>
         <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
-        <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -106,7 +107,7 @@
             <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=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
+            <arg value="-output=${basedir}/js/out" />
             <arg value="-load-config=${basedir}/compile-asjs-config.xml" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
@@ -120,6 +121,9 @@
             <fileset dir="${basedir}/js/src">
                 <include name="**/**" />
             </fileset>
+            <fileset dir="${basedir}/js/out">
+                <include name="**/**" />
+            </fileset>
         </copy>
     </target>
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Core/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/compile-config.xml b/frameworks/projects/Core/compile-config.xml
index fe4ac4e..718bf56 100644
--- a/frameworks/projects/Core/compile-config.xml
+++ b/frameworks/projects/Core/compile-config.xml
@@ -64,6 +64,12 @@
     </compiler>
     
     <include-file>
+        <name>js/out/*</name>
+        <path>js/out/*</path>
+    </include-file>
+    <include-file>
+        <name>js/src/*</name>
+        <path>js/src/*</path>
     </include-file>
 
     <include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/CreateJS/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/compile-config.xml b/frameworks/projects/CreateJS/compile-config.xml
index 6f0358c..96f74fd 100644
--- a/frameworks/projects/CreateJS/compile-config.xml
+++ b/frameworks/projects/CreateJS/compile-config.xml
@@ -64,6 +64,10 @@
         <name>defaults.css</name>
         <path>as/defaults.css</path>
     </include-file>
+    <include-file>
+        <name>js/src/*</name>
+        <path>js/src/*</path>
+    </include-file>
 
     <include-classes>
         <class>CreateJSClasses</class>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/DragDrop/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/build.xml b/frameworks/projects/DragDrop/build.xml
index 52f668a..b5db45b 100644
--- a/frameworks/projects/DragDrop/build.xml
+++ b/frameworks/projects/DragDrop/build.xml
@@ -69,6 +69,8 @@
         <echo message="Compiling libs/DragDrop.swc"/>
         <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" />
 
         <!-- Load the <compc> task. We can't do this at the <project> level
-->
         <!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -97,7 +99,6 @@
     <target name="compile-asjs" >
         <echo message="Cross-compiling DragDrop/asjs"/>
         <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
-        <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -106,7 +107,7 @@
             <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=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
+            <arg value="-output=${basedir}/js/out" />
             <arg value="-load-config=${basedir}/compile-asjs-config.xml" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
@@ -120,6 +121,9 @@
             <fileset dir="${basedir}/js/src">
                 <include name="**/**" />
             </fileset>
+            <fileset dir="${basedir}/js/out">
+                <include name="**/**" />
+            </fileset>
         </copy>
     </target>
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/DragDrop/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/compile-config.xml b/frameworks/projects/DragDrop/compile-config.xml
index d430873..7506e1d 100644
--- a/frameworks/projects/DragDrop/compile-config.xml
+++ b/frameworks/projects/DragDrop/compile-config.xml
@@ -61,6 +61,12 @@
     </compiler>
     
     <include-file>
+        <name>js/out/*</name>
+        <path>js/out/*</path>
+    </include-file>
+    <include-file>
+        <name>js/src/*</name>
+        <path>js/src/*</path>
     </include-file>
 
     <include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Effects/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/build.xml b/frameworks/projects/Effects/build.xml
index 1cb2677..1cb752a 100644
--- a/frameworks/projects/Effects/build.xml
+++ b/frameworks/projects/Effects/build.xml
@@ -70,6 +70,8 @@
         <echo message="Compiling libs/Effects.swc"/>
         <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" />
 
         <!-- Load the <compc> task. We can't do this at the <project> level
-->
         <!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -98,7 +100,6 @@
     <target name="compile-asjs" >
         <echo message="Cross-compiling Effects/asjs"/>
         <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
-        <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -107,7 +108,7 @@
             <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=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
+            <arg value="-output=${basedir}/js/out" />
             <arg value="-load-config=${basedir}/compile-asjs-config.xml" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
@@ -121,6 +122,9 @@
             <fileset dir="${basedir}/js/src">
                 <include name="**/**" />
             </fileset>
+            <fileset dir="${basedir}/js/out">
+                <include name="**/**" />
+            </fileset>
         </copy>
     </target>
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Effects/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/compile-config.xml b/frameworks/projects/Effects/compile-config.xml
index 22f79d8..68b4ab8 100644
--- a/frameworks/projects/Effects/compile-config.xml
+++ b/frameworks/projects/Effects/compile-config.xml
@@ -61,6 +61,12 @@
     </compiler>
     
     <include-file>
+        <name>js/out/*</name>
+        <path>js/out/*</path>
+    </include-file>
+    <include-file>
+        <name>js/src/*</name>
+        <path>js/src/*</path>
     </include-file>
 
     <include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Formatters/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Formatters/build.xml b/frameworks/projects/Formatters/build.xml
index ebd561f..a613dce 100644
--- a/frameworks/projects/Formatters/build.xml
+++ b/frameworks/projects/Formatters/build.xml
@@ -70,6 +70,8 @@
         <echo message="Compiling libs/Formatters.swc"/>
         <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" />
 
         <!-- Load the <compc> task. We can't do this at the <project> level
-->
         <!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -98,7 +100,6 @@
     <target name="compile-asjs" >
         <echo message="Cross-compiling Formatters/asjs"/>
         <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
-        <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -107,7 +108,7 @@
             <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=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
+            <arg value="-output=${basedir}/js/out" />
             <arg value="-load-config=${basedir}/compile-asjs-config.xml" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
@@ -121,6 +122,9 @@
             <fileset dir="${basedir}/js/src">
                 <include name="**/**" />
             </fileset>
+            <fileset dir="${basedir}/js/out">
+                <include name="**/**" />
+            </fileset>
         </copy>
     </target>
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Formatters/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Formatters/compile-config.xml b/frameworks/projects/Formatters/compile-config.xml
index 6099456..6e59964 100644
--- a/frameworks/projects/Formatters/compile-config.xml
+++ b/frameworks/projects/Formatters/compile-config.xml
@@ -62,6 +62,12 @@
     </compiler>
     
     <include-file>
+        <name>js/out/*</name>
+        <path>js/out/*</path>
+    </include-file>
+    <include-file>
+        <name>js/src/*</name>
+        <path>js/src/*</path>
     </include-file>
 
     <include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/GoogleMaps/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/compile-config.xml b/frameworks/projects/GoogleMaps/compile-config.xml
index 1f9857b..8017798 100644
--- a/frameworks/projects/GoogleMaps/compile-config.xml
+++ b/frameworks/projects/GoogleMaps/compile-config.xml
@@ -63,6 +63,10 @@
         <name>defaults.css</name>
         <path>as/defaults.css</path>
     </include-file>
+    <include-file>
+        <name>js/src/*</name>
+        <path>js/src/*</path>
+    </include-file>
 
     <include-classes>
         <class>GoogleMapsClasses</class>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Graphics/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/compile-config.xml b/frameworks/projects/Graphics/compile-config.xml
index 967426e..eb660f2 100644
--- a/frameworks/projects/Graphics/compile-config.xml
+++ b/frameworks/projects/Graphics/compile-config.xml
@@ -60,6 +60,8 @@
     </compiler>
     
     <include-file>
+        <name>js/src/*</name>
+        <path>js/src/*</path>
     </include-file>
 
     <include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/HTML/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/build.xml b/frameworks/projects/HTML/build.xml
index 67d632b..e82078d 100644
--- a/frameworks/projects/HTML/build.xml
+++ b/frameworks/projects/HTML/build.xml
@@ -69,6 +69,8 @@
         <echo message="Compiling libs/HTML.swc"/>
         <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" />
 
         <!-- Load the <compc> task. We can't do this at the <project> level
-->
         <!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -97,7 +99,6 @@
     <target name="compile-asjs" >
         <echo message="Cross-compiling HTML/asjs"/>
         <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
-        <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -106,7 +107,7 @@
             <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=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
+            <arg value="-output=${basedir}/js/out" />
             <arg value="-load-config=${basedir}/compile-asjs-config.xml" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
@@ -120,6 +121,9 @@
             <fileset dir="${basedir}/js/src">
                 <include name="**/**" />
             </fileset>
+            <fileset dir="${basedir}/js/out">
+                <include name="**/**" />
+            </fileset>
         </copy>
     </target>
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/HTML/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/compile-config.xml b/frameworks/projects/HTML/compile-config.xml
index fc3c1e9..8d7bfd5 100644
--- a/frameworks/projects/HTML/compile-config.xml
+++ b/frameworks/projects/HTML/compile-config.xml
@@ -70,6 +70,14 @@
         <name>defaults.css</name>
         <path>as/defaults.css</path>
     </include-file>
+    <include-file>
+        <name>js/out/*</name>
+        <path>js/out/*</path>
+    </include-file>
+    <include-file>
+        <name>js/src/*</name>
+        <path>js/src/*</path>
+    </include-file>
 
     <include-classes>
         <class>HTMLClasses</class>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/HTML5/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML5/compile-config.xml b/frameworks/projects/HTML5/compile-config.xml
index 0950f6d..3bca049 100644
--- a/frameworks/projects/HTML5/compile-config.xml
+++ b/frameworks/projects/HTML5/compile-config.xml
@@ -64,6 +64,10 @@
         <name>defaults.css</name>
         <path>as/defaults.css</path>
     </include-file>
+    <include-file>
+        <name>js/src/*</name>
+        <path>js/src/*</path>
+    </include-file>
 
     <include-classes>
         <class>HTML5Classes</class>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/JQuery/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/JQuery/compile-config.xml b/frameworks/projects/JQuery/compile-config.xml
index 1d6e400..59f2bfb 100644
--- a/frameworks/projects/JQuery/compile-config.xml
+++ b/frameworks/projects/JQuery/compile-config.xml
@@ -64,6 +64,10 @@
         <name>defaults.css</name>
         <path>as/defaults.css</path>
     </include-file>
+    <include-file>
+        <name>js/src/*</name>
+        <path>js/src/*</path>
+    </include-file>
 
     <include-classes>
         <class>JQueryClasses</class>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Mobile/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/build.xml b/frameworks/projects/Mobile/build.xml
index a1e060e..6f489ea 100644
--- a/frameworks/projects/Mobile/build.xml
+++ b/frameworks/projects/Mobile/build.xml
@@ -69,6 +69,8 @@
         <echo message="Compiling libs/Mobile.swc"/>
         <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" />
 
         <!-- Load the <compc> task. We can't do this at the <project> level
-->
         <!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -97,7 +99,6 @@
     <target name="compile-asjs" >
         <echo message="Cross-compiling Mobile/asjs"/>
         <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
-        <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -106,7 +107,7 @@
             <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=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
+            <arg value="-output=${basedir}/js/out" />
             <arg value="-load-config=${basedir}/compile-asjs-config.xml" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
@@ -120,6 +121,9 @@
             <fileset dir="${basedir}/js/src">
                 <include name="**/**" />
             </fileset>
+            <fileset dir="${basedir}/js/out">
+                <include name="**/**" />
+            </fileset>
         </copy>
     </target>
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Mobile/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/compile-config.xml b/frameworks/projects/Mobile/compile-config.xml
index d63598c..980f4ad 100644
--- a/frameworks/projects/Mobile/compile-config.xml
+++ b/frameworks/projects/Mobile/compile-config.xml
@@ -66,6 +66,12 @@
     </compiler>
     
     <include-file>
+        <name>js/out/*</name>
+        <path>js/out/*</path>
+    </include-file>
+    <include-file>
+        <name>js/src/*</name>
+        <path>js/src/*</path>
     </include-file>
 
     <include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eabf1d41/frameworks/projects/Network/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Network/compile-config.xml b/frameworks/projects/Network/compile-config.xml
index 92c3643..f62a960 100644
--- a/frameworks/projects/Network/compile-config.xml
+++ b/frameworks/projects/Network/compile-config.xml
@@ -60,6 +60,8 @@
     </compiler>
     
     <include-file>
+        <name>js/src/*</name>
+        <path>js/src/*</path>
     </include-file>
 
     <include-classes>


Mime
View raw message