flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yish...@apache.org
Subject [17/27] git commit: [flex-asjs] [refs/heads/refactor-sprite] - change build to build JS last now that it can pack its output into existing SWCs
Date Thu, 06 Oct 2016 09:33:52 GMT
change build to build JS last now that it can pack its output into existing SWCs


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

Branch: refs/heads/refactor-sprite
Commit: b8d8c48b11f41ea435eefafc94eb0927229e8a4b
Parents: d585dc6
Author: Alex Harui <aharui@apache.org>
Authored: Thu Sep 29 15:41:18 2016 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Fri Sep 30 08:21:02 2016 -0700

----------------------------------------------------------------------
 build.xml                                          |  3 ---
 frameworks/js/FlexJS/projects/BindingJS/build.xml  |  8 ++++++--
 frameworks/js/FlexJS/projects/ChartsJS/build.xml   |  8 ++++++--
 .../js/FlexJS/projects/CollectionsJS/build.xml     |  8 ++++++--
 frameworks/js/FlexJS/projects/CoreJS/build.xml     |  8 ++++++--
 frameworks/js/FlexJS/projects/CreateJSJS/build.xml |  8 ++++++--
 frameworks/js/FlexJS/projects/DragDropJS/build.xml |  8 ++++++--
 frameworks/js/FlexJS/projects/EffectsJS/build.xml  |  9 +++++++--
 frameworks/js/FlexJS/projects/FlatJS/build.xml     |  9 +++++++--
 .../js/FlexJS/projects/FormattersJS/build.xml      |  8 ++++++--
 .../js/FlexJS/projects/GoogleMapsJS/build.xml      |  8 ++++++--
 frameworks/js/FlexJS/projects/GraphicsJS/build.xml |  8 ++++++--
 frameworks/js/FlexJS/projects/HTML5JS/build.xml    |  8 ++++++--
 frameworks/js/FlexJS/projects/HTMLJS/build.xml     |  8 ++++++--
 frameworks/js/FlexJS/projects/JQueryJS/build.xml   |  8 ++++++--
 frameworks/js/FlexJS/projects/LanguageJS/build.xml |  8 ++++++--
 frameworks/js/FlexJS/projects/MobileJS/build.xml   |  8 ++++++--
 frameworks/js/FlexJS/projects/NetworkJS/build.xml  |  8 ++++++--
 .../js/FlexJS/projects/ReflectionJS/build.xml      |  8 ++++++--
 frameworks/js/FlexJS/projects/StorageJS/build.xml  |  8 ++++++--
 frameworks/js/FlexJS/projects/XMLJS/build.xml      |  8 ++++++--
 frameworks/projects/Binding/build.xml              | 15 ++++++---------
 frameworks/projects/Binding/pom.xml                |  6 ------
 .../Binding/src/main/config/compile-as-config.xml  |  5 -----
 frameworks/projects/Charts/build.xml               | 15 ++++++---------
 frameworks/projects/Charts/pom.xml                 |  4 ----
 .../Charts/src/main/config/compile-as-config.xml   |  4 ----
 frameworks/projects/Collections/build.xml          | 15 ++++++---------
 frameworks/projects/Collections/pom.xml            |  6 ------
 .../src/main/config/compile-as-config.xml          |  5 -----
 frameworks/projects/Core/build.xml                 | 15 ++++++---------
 frameworks/projects/Core/pom.xml                   |  6 ------
 .../Core/src/main/config/compile-as-config.xml     |  6 ------
 frameworks/projects/CreateJS/build.xml             | 17 +++++++----------
 frameworks/projects/CreateJS/pom.xml               |  4 ----
 .../CreateJS/src/main/config/compile-as-config.xml |  4 ----
 frameworks/projects/DragDrop/build.xml             | 15 ++++++---------
 frameworks/projects/DragDrop/pom.xml               |  6 ------
 .../DragDrop/src/main/config/compile-as-config.xml |  5 -----
 frameworks/projects/Effects/build.xml              | 15 ++++++---------
 frameworks/projects/Effects/pom.xml                |  6 ------
 .../Effects/src/main/config/compile-as-config.xml  |  5 -----
 frameworks/projects/Flat/build.xml                 | 15 ++++++---------
 frameworks/projects/Flat/pom.xml                   |  4 ----
 .../Flat/src/main/config/compile-as-config.xml     |  4 ----
 frameworks/projects/Formatters/build.xml           | 15 ++++++---------
 frameworks/projects/Formatters/pom.xml             |  6 ------
 .../src/main/config/compile-as-config.xml          |  5 -----
 frameworks/projects/GoogleMaps/build.xml           | 15 ++++++---------
 frameworks/projects/GoogleMaps/pom.xml             |  4 ----
 .../src/main/config/compile-as-config.xml          |  4 ----
 frameworks/projects/Graphics/build.xml             | 15 ++++++---------
 frameworks/projects/Graphics/pom.xml               |  6 ------
 .../Graphics/src/main/config/compile-as-config.xml |  5 -----
 frameworks/projects/HTML/build.xml                 | 15 ++++++---------
 frameworks/projects/HTML/pom.xml                   |  4 ----
 .../HTML/src/main/config/compile-as-config.xml     |  4 ----
 frameworks/projects/HTML5/build.xml                | 15 ++++++---------
 frameworks/projects/HTML5/pom.xml                  |  4 ----
 .../HTML5/src/main/config/compile-as-config.xml    |  4 ----
 frameworks/projects/JQuery/build.xml               | 15 ++++++---------
 frameworks/projects/JQuery/pom.xml                 |  4 ----
 .../JQuery/src/main/config/compile-as-config.xml   |  4 ----
 frameworks/projects/Language/build.xml             | 15 ++++++---------
 frameworks/projects/Language/pom.xml               |  6 ------
 .../Language/src/main/config/compile-as-config.xml |  6 ------
 frameworks/projects/Mobile/build.xml               | 15 ++++++---------
 frameworks/projects/Mobile/pom.xml                 |  4 ----
 .../Mobile/src/main/config/compile-as-config.xml   |  4 ----
 frameworks/projects/Network/build.xml              | 15 ++++++---------
 frameworks/projects/Network/pom.xml                |  6 ------
 .../Network/src/main/config/compile-as-config.xml  |  5 -----
 frameworks/projects/Reflection/build.xml           | 15 ++++++---------
 frameworks/projects/Reflection/pom.xml             |  6 ------
 .../src/main/config/compile-as-config.xml          |  5 -----
 frameworks/projects/Storage/build.xml              | 15 ++++++---------
 frameworks/projects/Storage/pom.xml                |  4 ----
 .../Storage/src/main/config/compile-as-config.xml  |  4 ----
 frameworks/projects/XML/build.xml                  | 16 ++++++----------
 frameworks/projects/XML/pom.xml                    |  6 ------
 .../XML/src/main/config/compile-as-config.xml      |  5 -----
 81 files changed, 243 insertions(+), 420 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index f5ab8c5..18a583b 100644
--- a/build.xml
+++ b/build.xml
@@ -496,9 +496,6 @@
     -->
 
     <target name="frameworks" description="Full build of all Actionscript framework SWCs, including resource bundles and themes" unless="airsdk.found">
-        <ant dir="${basedir}/frameworks/js/FlexJS">
-            <property name="locale" value="${locale}"/>
-        </ant>
         <ant dir="${basedir}/frameworks">
             <property name="locale" value="${locale}"/>
         </ant>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/BindingJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/BindingJS/build.xml b/frameworks/js/FlexJS/projects/BindingJS/build.xml
index 8574b3c..454fa2a 100644
--- a/frameworks/js/FlexJS/projects/BindingJS/build.xml
+++ b/frameworks/js/FlexJS/projects/BindingJS/build.xml
@@ -28,8 +28,12 @@
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     
     <property name="target.name" value="${ant.project.name}.swc" />
+    <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+    <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+    <property file="${basedir}/${target.name}.properties"/>
+    <delete file="${basedir}/${target.name}.properties"/>
     
-    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
     </target>
     
     <target name="clean">
@@ -58,7 +62,7 @@
             <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="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
             <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
             <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
         </java>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/ChartsJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/ChartsJS/build.xml b/frameworks/js/FlexJS/projects/ChartsJS/build.xml
index 29155ac..f901286 100644
--- a/frameworks/js/FlexJS/projects/ChartsJS/build.xml
+++ b/frameworks/js/FlexJS/projects/ChartsJS/build.xml
@@ -28,8 +28,12 @@
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     
     <property name="target.name" value="${ant.project.name}.swc" />
+    <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+    <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+    <property file="${basedir}/${target.name}.properties"/>
+    <delete file="${basedir}/${target.name}.properties"/>
     
-    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
     </target>
     
     <target name="clean">
@@ -58,7 +62,7 @@
             <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="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
             <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
             <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
         </java>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/CollectionsJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/CollectionsJS/build.xml b/frameworks/js/FlexJS/projects/CollectionsJS/build.xml
index a8e3afc..f1f976d 100644
--- a/frameworks/js/FlexJS/projects/CollectionsJS/build.xml
+++ b/frameworks/js/FlexJS/projects/CollectionsJS/build.xml
@@ -28,8 +28,12 @@
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     
     <property name="target.name" value="${ant.project.name}.swc" />
+    <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+    <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+    <property file="${basedir}/${target.name}.properties"/>
+    <delete file="${basedir}/${target.name}.properties"/>
     
-    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
     </target>
     
     <target name="clean">
@@ -58,7 +62,7 @@
             <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="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
             <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
             <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
         </java>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/CoreJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/CoreJS/build.xml b/frameworks/js/FlexJS/projects/CoreJS/build.xml
index 8ebb892..1c1f737 100644
--- a/frameworks/js/FlexJS/projects/CoreJS/build.xml
+++ b/frameworks/js/FlexJS/projects/CoreJS/build.xml
@@ -28,8 +28,12 @@
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     
     <property name="target.name" value="${ant.project.name}.swc" />
+    <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+    <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+    <property file="${basedir}/${target.name}.properties"/>
+    <delete file="${basedir}/${target.name}.properties"/>
     
-    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
     </target>
     
     <target name="clean">
@@ -58,7 +62,7 @@
             <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="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
             <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
             <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
         </java>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/CreateJSJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/CreateJSJS/build.xml b/frameworks/js/FlexJS/projects/CreateJSJS/build.xml
index ab7f80e..75bb24e 100644
--- a/frameworks/js/FlexJS/projects/CreateJSJS/build.xml
+++ b/frameworks/js/FlexJS/projects/CreateJSJS/build.xml
@@ -28,8 +28,12 @@
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     
     <property name="target.name" value="${ant.project.name}.swc" />
+    <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+    <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+    <property file="${basedir}/${target.name}.properties"/>
+    <delete file="${basedir}/${target.name}.properties"/>
     
-    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
     </target>
     
     <target name="clean">
@@ -58,7 +62,7 @@
             <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="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
             <arg value="-load-config=${FLEX_HOME}/frameworks/createjs-config.xml" />
             <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
         </java>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/DragDropJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/DragDropJS/build.xml b/frameworks/js/FlexJS/projects/DragDropJS/build.xml
index f02daeb..1a97cc8 100644
--- a/frameworks/js/FlexJS/projects/DragDropJS/build.xml
+++ b/frameworks/js/FlexJS/projects/DragDropJS/build.xml
@@ -28,8 +28,12 @@
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     
     <property name="target.name" value="${ant.project.name}.swc" />
+    <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+    <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+    <property file="${basedir}/${target.name}.properties"/>
+    <delete file="${basedir}/${target.name}.properties"/>
     
-    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
     </target>
     
     <target name="clean">
@@ -58,7 +62,7 @@
             <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="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
             <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
             <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
         </java>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/EffectsJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/EffectsJS/build.xml b/frameworks/js/FlexJS/projects/EffectsJS/build.xml
index 1849dcf..698a40b 100644
--- a/frameworks/js/FlexJS/projects/EffectsJS/build.xml
+++ b/frameworks/js/FlexJS/projects/EffectsJS/build.xml
@@ -28,8 +28,13 @@
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     
     <property name="target.name" value="${ant.project.name}.swc" />
+    <property name="target.name" value="${ant.project.name}.swc" />
+    <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+    <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+    <property file="${basedir}/${target.name}.properties"/>
+    <delete file="${basedir}/${target.name}.properties"/>
     
-    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
     </target>
     
     <target name="clean">
@@ -58,7 +63,7 @@
             <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="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
             <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
             <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
         </java>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/FlatJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/FlatJS/build.xml b/frameworks/js/FlexJS/projects/FlatJS/build.xml
index 7296c3f..45214de 100644
--- a/frameworks/js/FlexJS/projects/FlatJS/build.xml
+++ b/frameworks/js/FlexJS/projects/FlatJS/build.xml
@@ -28,8 +28,13 @@
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     
     <property name="target.name" value="${ant.project.name}.swc" />
+    <property name="target.name" value="${ant.project.name}.swc" />
+    <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+    <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+    <property file="${basedir}/${target.name}.properties"/>
+    <delete file="${basedir}/${target.name}.properties"/>
     
-    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
     </target>
     
     <target name="clean">
@@ -58,7 +63,7 @@
             <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="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
             <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
             <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
         </java>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/FormattersJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/FormattersJS/build.xml b/frameworks/js/FlexJS/projects/FormattersJS/build.xml
index 2b5e129..7708d84 100644
--- a/frameworks/js/FlexJS/projects/FormattersJS/build.xml
+++ b/frameworks/js/FlexJS/projects/FormattersJS/build.xml
@@ -28,8 +28,12 @@
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     
     <property name="target.name" value="${ant.project.name}.swc" />
+    <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+    <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+    <property file="${basedir}/${target.name}.properties"/>
+    <delete file="${basedir}/${target.name}.properties"/>
     
-    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
     </target>
     
     <target name="clean">
@@ -58,7 +62,7 @@
             <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="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
             <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
             <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
         </java>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml b/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml
index aaf8f01..2656529 100644
--- a/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml
+++ b/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml
@@ -28,8 +28,12 @@
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     
     <property name="target.name" value="${ant.project.name}.swc" />
+    <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+    <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+    <property file="${basedir}/${target.name}.properties"/>
+    <delete file="${basedir}/${target.name}.properties"/>
     
-    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
     </target>
     
     <target name="clean">
@@ -58,7 +62,7 @@
             <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="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
             <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
             <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
         </java>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/GraphicsJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/GraphicsJS/build.xml b/frameworks/js/FlexJS/projects/GraphicsJS/build.xml
index 97c8fa6..628f069 100644
--- a/frameworks/js/FlexJS/projects/GraphicsJS/build.xml
+++ b/frameworks/js/FlexJS/projects/GraphicsJS/build.xml
@@ -28,8 +28,12 @@
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     
     <property name="target.name" value="${ant.project.name}.swc" />
+    <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+    <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+    <property file="${basedir}/${target.name}.properties"/>
+    <delete file="${basedir}/${target.name}.properties"/>
     
-    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
     </target>
     
     <target name="clean">
@@ -58,7 +62,7 @@
             <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="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
             <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
             <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
         </java>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/HTML5JS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/HTML5JS/build.xml b/frameworks/js/FlexJS/projects/HTML5JS/build.xml
index d6a382c..3843b20 100644
--- a/frameworks/js/FlexJS/projects/HTML5JS/build.xml
+++ b/frameworks/js/FlexJS/projects/HTML5JS/build.xml
@@ -28,8 +28,12 @@
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     
     <property name="target.name" value="${ant.project.name}.swc" />
+    <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+    <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+    <property file="${basedir}/${target.name}.properties"/>
+    <delete file="${basedir}/${target.name}.properties"/>
     
-    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
     </target>
     
     <target name="clean">
@@ -58,7 +62,7 @@
             <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="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
             <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
             <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
         </java>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/HTMLJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/HTMLJS/build.xml b/frameworks/js/FlexJS/projects/HTMLJS/build.xml
index 2966638..ee07b10 100644
--- a/frameworks/js/FlexJS/projects/HTMLJS/build.xml
+++ b/frameworks/js/FlexJS/projects/HTMLJS/build.xml
@@ -28,8 +28,12 @@
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     
     <property name="target.name" value="${ant.project.name}.swc" />
+    <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+    <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+    <property file="${basedir}/${target.name}.properties"/>
+    <delete file="${basedir}/${target.name}.properties"/>
     
-    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
     </target>
     
     <target name="clean">
@@ -58,7 +62,7 @@
             <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="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
             <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
             <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
         </java>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/JQueryJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/JQueryJS/build.xml b/frameworks/js/FlexJS/projects/JQueryJS/build.xml
index 35fb357..41c057a 100644
--- a/frameworks/js/FlexJS/projects/JQueryJS/build.xml
+++ b/frameworks/js/FlexJS/projects/JQueryJS/build.xml
@@ -28,8 +28,12 @@
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     
     <property name="target.name" value="${ant.project.name}.swc" />
+    <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+    <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+    <property file="${basedir}/${target.name}.properties"/>
+    <delete file="${basedir}/${target.name}.properties"/>
     
-    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
     </target>
     
     <target name="clean">
@@ -58,7 +62,7 @@
             <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="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
             <arg value="-load-config=${FLEX_HOME}/frameworks/jquery-config.xml" />
             <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
         </java>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/LanguageJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/LanguageJS/build.xml b/frameworks/js/FlexJS/projects/LanguageJS/build.xml
index 75968a2..5365aba 100644
--- a/frameworks/js/FlexJS/projects/LanguageJS/build.xml
+++ b/frameworks/js/FlexJS/projects/LanguageJS/build.xml
@@ -28,8 +28,12 @@
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     
     <property name="target.name" value="${ant.project.name}.swc" />
+    <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+    <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+    <property file="${basedir}/${target.name}.properties"/>
+    <delete file="${basedir}/${target.name}.properties"/>
     
-    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
     </target>
     
     <target name="clean">
@@ -58,7 +62,7 @@
             <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="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
             <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
             <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
         </java>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/MobileJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/MobileJS/build.xml b/frameworks/js/FlexJS/projects/MobileJS/build.xml
index 6393c32..8244c63 100644
--- a/frameworks/js/FlexJS/projects/MobileJS/build.xml
+++ b/frameworks/js/FlexJS/projects/MobileJS/build.xml
@@ -28,8 +28,12 @@
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     
     <property name="target.name" value="${ant.project.name}.swc" />
+    <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+    <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+    <property file="${basedir}/${target.name}.properties"/>
+    <delete file="${basedir}/${target.name}.properties"/>
     
-    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
     </target>
     
     <target name="clean">
@@ -58,7 +62,7 @@
             <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="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
             <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
             <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
         </java>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/NetworkJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/NetworkJS/build.xml b/frameworks/js/FlexJS/projects/NetworkJS/build.xml
index e4cca09..053b6cc 100644
--- a/frameworks/js/FlexJS/projects/NetworkJS/build.xml
+++ b/frameworks/js/FlexJS/projects/NetworkJS/build.xml
@@ -28,8 +28,12 @@
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     
     <property name="target.name" value="${ant.project.name}.swc" />
+    <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+    <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+    <property file="${basedir}/${target.name}.properties"/>
+    <delete file="${basedir}/${target.name}.properties"/>
     
-    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
     </target>
     
     <target name="clean">
@@ -58,7 +62,7 @@
             <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="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
             <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
             <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
         </java>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/ReflectionJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/ReflectionJS/build.xml b/frameworks/js/FlexJS/projects/ReflectionJS/build.xml
index 09e1db4..f058231 100644
--- a/frameworks/js/FlexJS/projects/ReflectionJS/build.xml
+++ b/frameworks/js/FlexJS/projects/ReflectionJS/build.xml
@@ -28,8 +28,12 @@
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     
     <property name="target.name" value="${ant.project.name}.swc" />
+    <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+    <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+    <property file="${basedir}/${target.name}.properties"/>
+    <delete file="${basedir}/${target.name}.properties"/>
     
-    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
     </target>
     
     <target name="clean">
@@ -58,7 +62,7 @@
             <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="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
             <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
             <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
         </java>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/StorageJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/StorageJS/build.xml b/frameworks/js/FlexJS/projects/StorageJS/build.xml
index 97bbb8f..c328fe2 100644
--- a/frameworks/js/FlexJS/projects/StorageJS/build.xml
+++ b/frameworks/js/FlexJS/projects/StorageJS/build.xml
@@ -28,8 +28,12 @@
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     
     <property name="target.name" value="${ant.project.name}.swc" />
+    <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+    <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+    <property file="${basedir}/${target.name}.properties"/>
+    <delete file="${basedir}/${target.name}.properties"/>
     
-    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
     </target>
     
     <target name="clean">
@@ -58,7 +62,7 @@
             <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="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
             <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
             <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
         </java>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/js/FlexJS/projects/XMLJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/XMLJS/build.xml b/frameworks/js/FlexJS/projects/XMLJS/build.xml
index 09ab015..e82d048 100644
--- a/frameworks/js/FlexJS/projects/XMLJS/build.xml
+++ b/frameworks/js/FlexJS/projects/XMLJS/build.xml
@@ -28,8 +28,12 @@
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     
     <property name="target.name" value="${ant.project.name}.swc" />
+    <echo file="${basedir}/${target.name}.properties">target.name.nojs=${ant.project.name}</echo>
+    <replaceregexp file="${basedir}/${target.name}.properties" match="(.*)JS$" replace="\1" flags="m" />
+    <property file="${basedir}/${target.name}.properties"/>
+    <delete file="${basedir}/${target.name}.properties"/>
     
-    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs,copy-js" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc">
     </target>
     
     <target name="clean">
@@ -58,7 +62,7 @@
             <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="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" />
             <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
             <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" />
         </java>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Binding/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/build.xml b/frameworks/projects/Binding/build.xml
index 7ecb7ba..117b98a 100644
--- a/frameworks/projects/Binding/build.xml
+++ b/frameworks/projects/Binding/build.xml
@@ -29,18 +29,17 @@
     
     <property name="target.name" value="${ant.project.name}.swc" />
     
-    <target name="main" depends="clean,check-compiler,js-if-needed,compile,test" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc">
     </target>
     
-    <target name="check-js">
-        <uptodate property="js-not-needed" targetfile="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/target/${ant.project.name}JS.swc">
-            <srcfiles dir="${basedir}/src/main/flex" includes="**/**"/>
-        </uptodate>
-    </target>
-    <target name="js-if-needed" depends="check-js" unless="js-not-needed">
+    <target name="compile-js">
         <ant dir="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/" inheritAll="false" />
     </target>
     
+    <target name="copy-swc">
+        <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
+    </target>
+    
     <target name="check-for-tests" >
         <condition property="skip-tests" >
             <not>
@@ -75,8 +74,6 @@
         <echo message="Compiling libs/${ant.project.name}.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}/target/generated-sources/flexjs" />
         
         <compc fork="true"
             output="${basedir}/target/${target.name}">

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Binding/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/pom.xml b/frameworks/projects/Binding/pom.xml
index dfcb04b..347c232 100644
--- a/frameworks/projects/Binding/pom.xml
+++ b/frameworks/projects/Binding/pom.xml
@@ -48,12 +48,6 @@
             </namespace>
           </namespaces>
           <includeSources>true</includeSources>
-          <includeFiles>
-            <include-file>
-              <name>js/out/*</name>
-              <path>generated-sources/flexjs/*</path>
-            </include-file>
-          </includeFiles>
         </configuration>
       </plugin>
     </plugins>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Binding/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/src/main/config/compile-as-config.xml b/frameworks/projects/Binding/src/main/config/compile-as-config.xml
index c09e14e..9f68b12 100644
--- a/frameworks/projects/Binding/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Binding/src/main/config/compile-as-config.xml
@@ -59,11 +59,6 @@
         <warn-no-constructor>false</warn-no-constructor>
     </compiler>
     
-    <include-file>
-        <name>js/out/*</name>
-        <path>../../../../../js/FlexJS/projects/BindingJS/target/generated-sources/flexjs/*</path>
-    </include-file>
-
     <include-classes>
         <class>BindingClasses</class>
     </include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Charts/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/build.xml b/frameworks/projects/Charts/build.xml
index d5b0e5e..0f9dae4 100644
--- a/frameworks/projects/Charts/build.xml
+++ b/frameworks/projects/Charts/build.xml
@@ -29,18 +29,17 @@
     
     <property name="target.name" value="${ant.project.name}.swc" />
     
-    <target name="main" depends="clean,check-compiler,js-if-needed,compile,test" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc">
     </target>
     
-    <target name="check-js">
-        <uptodate property="js-not-needed" targetfile="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/target/${ant.project.name}JS.swc">
-            <srcfiles dir="${basedir}/src/main/flex" includes="**/**"/>
-        </uptodate>
-    </target>
-    <target name="js-if-needed" depends="check-js" unless="js-not-needed">
+    <target name="compile-js">
         <ant dir="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/" inheritAll="false" />
     </target>
     
+    <target name="copy-swc">
+        <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
+    </target>
+    
     <target name="check-for-tests" >
         <condition property="skip-tests" >
             <not>
@@ -75,8 +74,6 @@
         <echo message="Compiling libs/${ant.project.name}.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}/target/generated-sources/flexjs" />
         
         <compc fork="true"
             output="${basedir}/target/${target.name}">

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Charts/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/pom.xml b/frameworks/projects/Charts/pom.xml
index 394fcfe..2b4424e 100644
--- a/frameworks/projects/Charts/pom.xml
+++ b/frameworks/projects/Charts/pom.xml
@@ -55,10 +55,6 @@
               <name>defaults.css</name>
               <path>../src/main/resources/defaults.css</path>
             </include-file>
-            <include-file>
-              <name>js/out/*</name>
-              <path>generated-sources/flexjs/*</path>
-            </include-file>
           </includeFiles>
         </configuration>
       </plugin>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Charts/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/src/main/config/compile-as-config.xml b/frameworks/projects/Charts/src/main/config/compile-as-config.xml
index 728b5ca..465490d 100644
--- a/frameworks/projects/Charts/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Charts/src/main/config/compile-as-config.xml
@@ -66,10 +66,6 @@
         <name>defaults.css</name>
         <path>../resources/defaults.css</path>
     </include-file>
-    <include-file>
-        <name>js/out/*</name>
-        <path>../../../../../js/FlexJS/projects/ChartsJS/target/generated-sources/flexjs/*</path>
-    </include-file>
 
     <include-classes>
         <class>ChartsClasses</class>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Collections/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/build.xml b/frameworks/projects/Collections/build.xml
index 3330905..e24bf0f 100644
--- a/frameworks/projects/Collections/build.xml
+++ b/frameworks/projects/Collections/build.xml
@@ -29,18 +29,17 @@
     
     <property name="target.name" value="${ant.project.name}.swc" />
     
-    <target name="main" depends="clean,check-compiler,js-if-needed,compile,test" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc">
     </target>
     
-    <target name="check-js">
-        <uptodate property="js-not-needed" targetfile="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/target/${ant.project.name}JS.swc">
-            <srcfiles dir="${basedir}/src/main/flex" includes="**/**"/>
-        </uptodate>
-    </target>
-    <target name="js-if-needed" depends="check-js" unless="js-not-needed">
+    <target name="compile-js">
         <ant dir="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/" inheritAll="false" />
     </target>
     
+    <target name="copy-swc">
+        <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
+    </target>
+    
     <target name="check-for-tests" >
         <condition property="skip-tests" >
             <not>
@@ -75,8 +74,6 @@
         <echo message="Compiling libs/${ant.project.name}.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}/target/generated-sources/flexjs" />
         
         <compc fork="true"
             output="${basedir}/target/${target.name}">

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Collections/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/pom.xml b/frameworks/projects/Collections/pom.xml
index fd3b3ed..f6d6af5 100644
--- a/frameworks/projects/Collections/pom.xml
+++ b/frameworks/projects/Collections/pom.xml
@@ -50,12 +50,6 @@
           <includeClasses>
             <includeClass>CollectionsClasses</includeClass>
           </includeClasses>
-          <includeFiles>
-            <include-file>
-              <name>js/out/*</name>
-              <path>generated-sources/flexjs/*</path>
-            </include-file>
-          </includeFiles>
         </configuration>
       </plugin>
     </plugins>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Collections/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/src/main/config/compile-as-config.xml b/frameworks/projects/Collections/src/main/config/compile-as-config.xml
index 2940e3b..282c931 100644
--- a/frameworks/projects/Collections/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Collections/src/main/config/compile-as-config.xml
@@ -59,11 +59,6 @@
         <warn-no-constructor>false</warn-no-constructor>
     </compiler>
     
-    <include-file>
-        <name>js/out/*</name>
-        <path>../../../../../js/FlexJS/projects/CollectionsJS/target/generated-sources/flexjs/*</path>
-    </include-file>
-
     <include-classes>
         <class>CollectionsClasses</class>
     </include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Core/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/build.xml b/frameworks/projects/Core/build.xml
index c6744c5..0c1854a 100644
--- a/frameworks/projects/Core/build.xml
+++ b/frameworks/projects/Core/build.xml
@@ -29,18 +29,17 @@
     
     <property name="target.name" value="${ant.project.name}.swc" />
     
-    <target name="main" depends="clean,check-compiler,js-if-needed,compile,test" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc">
     </target>
     
-    <target name="check-js">
-        <uptodate property="js-not-needed" targetfile="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/target/${ant.project.name}JS.swc">
-            <srcfiles dir="${basedir}/src/main/flex" includes="**/**"/>
-        </uptodate>
-    </target>
-    <target name="js-if-needed" depends="check-js" unless="js-not-needed">
+    <target name="compile-js">
         <ant dir="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/" inheritAll="false" />
     </target>
     
+    <target name="copy-swc">
+        <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
+    </target>
+    
     <target name="check-for-tests" >
         <condition property="skip-tests" >
             <not>
@@ -75,8 +74,6 @@
         <echo message="Compiling libs/${ant.project.name}.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}/target/generated-sources/flexjs" />
         
         <compc fork="true"
             output="${basedir}/target/${target.name}">

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Core/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/pom.xml b/frameworks/projects/Core/pom.xml
index 6ca9a6d..16797fc 100644
--- a/frameworks/projects/Core/pom.xml
+++ b/frameworks/projects/Core/pom.xml
@@ -50,12 +50,6 @@
           <includeClasses>
             <includeClass>CoreClasses</includeClass>
           </includeClasses>
-          <includeFiles>
-            <include-file>
-              <name>js/out/*</name>
-              <path>generated-sources/flexjs/*</path>
-            </include-file>
-          </includeFiles>
           <skipExtern>false</skipExtern>
         </configuration>
       </plugin>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Core/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/config/compile-as-config.xml b/frameworks/projects/Core/src/main/config/compile-as-config.xml
index 76ff3a1..dec155b 100644
--- a/frameworks/projects/Core/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Core/src/main/config/compile-as-config.xml
@@ -53,7 +53,6 @@
         
         <source-path>
             <path-element>../flex</path-element>
-            <!--path-element>generated-sources/asjs</path-element-->
         </source-path>
         
         <warn-no-constructor>false</warn-no-constructor>
@@ -62,11 +61,6 @@
         <warn-instance-of-changes>false</warn-instance-of-changes>
     </compiler>
     
-    <include-file>
-        <name>js/out/*</name>
-        <path>../../../../../js/FlexJS/projects/CoreJS/target/generated-sources/flexjs/*</path>
-    </include-file>
-
     <include-classes>
         <class>CoreClasses</class>
     </include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/CreateJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/build.xml b/frameworks/projects/CreateJS/build.xml
index bf7c1cd..de0a253 100644
--- a/frameworks/projects/CreateJS/build.xml
+++ b/frameworks/projects/CreateJS/build.xml
@@ -29,18 +29,17 @@
     
     <property name="target.name" value="${ant.project.name}.swc" />
     
-    <target name="main" depends="clean,check-compiler,js-if-needed,compile,test" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc">
     </target>
     
-    <target name="check-js">
-        <uptodate property="js-not-needed" targetfile="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/target/${ant.project.name}JS.swc">
-            <srcfiles dir="${basedir}/src/main/flex" includes="**/**"/>
-        </uptodate>
-    </target>
-    <target name="js-if-needed" depends="check-js" unless="js-not-needed">
+    <target name="compile-js">
         <ant dir="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/" inheritAll="false" />
     </target>
     
+    <target name="copy-swc">
+        <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
+    </target>
+    
     <target name="check-for-tests" >
         <condition property="skip-tests" >
             <not>
@@ -75,9 +74,7 @@
         <echo message="Compiling libs/${ant.project.name}.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}/target/generated-sources/flexjs" />
-        
+
         <compc fork="true"
             output="${basedir}/target/${target.name}">
             <jvmarg line="${compc.jvm.args}"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/CreateJS/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/pom.xml b/frameworks/projects/CreateJS/pom.xml
index a550a17..cd1c3ae 100644
--- a/frameworks/projects/CreateJS/pom.xml
+++ b/frameworks/projects/CreateJS/pom.xml
@@ -55,10 +55,6 @@
               <name>defaults.css</name>
               <path>../src/main/resources/defaults.css</path>
             </include-file>
-            <include-file>
-              <name>js/out/*</name>
-              <path>generated-sources/flexjs/*</path>
-            </include-file>
           </includeFiles>
         </configuration>
       </plugin>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/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 5862e1b..b6c6cd3 100644
--- a/frameworks/projects/CreateJS/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/CreateJS/src/main/config/compile-as-config.xml
@@ -66,10 +66,6 @@
         <name>defaults.css</name>
         <path>../resources/defaults.css</path>
     </include-file>
-    <include-file>
-        <name>js/out/*</name>
-        <path>../../../../../js/FlexJS/projects/CreateJSJS/target/generated-sources/flexjs/*</path>
-    </include-file>
 
     <include-classes>
         <class>CreateJSClasses</class>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/DragDrop/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/build.xml b/frameworks/projects/DragDrop/build.xml
index ff8a41c..59bcd35 100644
--- a/frameworks/projects/DragDrop/build.xml
+++ b/frameworks/projects/DragDrop/build.xml
@@ -29,18 +29,17 @@
     
     <property name="target.name" value="${ant.project.name}.swc" />
     
-    <target name="main" depends="clean,check-compiler,js-if-needed,compile,test" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc">
     </target>
     
-    <target name="check-js">
-        <uptodate property="js-not-needed" targetfile="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/target/${ant.project.name}JS.swc">
-            <srcfiles dir="${basedir}/src/main/flex" includes="**/**"/>
-        </uptodate>
-    </target>
-    <target name="js-if-needed" depends="check-js" unless="js-not-needed">
+    <target name="compile-js">
         <ant dir="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/" inheritAll="false" />
     </target>
     
+    <target name="copy-swc">
+        <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
+    </target>
+    
     <target name="check-for-tests" >
         <condition property="skip-tests" >
             <not>
@@ -75,8 +74,6 @@
         <echo message="Compiling libs/${ant.project.name}.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}/target/generated-sources/flexjs" />
         
         <compc fork="true"
             output="${basedir}/target/${target.name}">

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/DragDrop/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/pom.xml b/frameworks/projects/DragDrop/pom.xml
index 7470cab..d3a9cff 100644
--- a/frameworks/projects/DragDrop/pom.xml
+++ b/frameworks/projects/DragDrop/pom.xml
@@ -50,12 +50,6 @@
           <includeClasses>
             <includeClass>DragDropClasses</includeClass>
           </includeClasses>
-          <includeFiles>
-            <include-file>
-              <name>js/out/*</name>
-              <path>generated-sources/flexjs/*</path>
-            </include-file>
-          </includeFiles>
         </configuration>
       </plugin>
     </plugins>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/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 8be2e5b..87f20cb 100644
--- a/frameworks/projects/DragDrop/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/DragDrop/src/main/config/compile-as-config.xml
@@ -59,11 +59,6 @@
         <warn-no-constructor>false</warn-no-constructor>
     </compiler>
     
-    <include-file>
-        <name>js/out/*</name>
-        <path>../../../../../js/FlexJS/projects/DragDropJS/target/generated-sources/flexjs/*</path>
-    </include-file>
-
     <include-classes>
         <class>DragDropClasses</class>
     </include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Effects/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/build.xml b/frameworks/projects/Effects/build.xml
index f4496a4..ee591bc 100644
--- a/frameworks/projects/Effects/build.xml
+++ b/frameworks/projects/Effects/build.xml
@@ -29,18 +29,17 @@
     
     <property name="target.name" value="${ant.project.name}.swc" />
     
-    <target name="main" depends="clean,check-compiler,js-if-needed,compile,test" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc">
     </target>
     
-    <target name="check-js">
-        <uptodate property="js-not-needed" targetfile="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/target/${ant.project.name}JS.swc">
-            <srcfiles dir="${basedir}/src/main/flex" includes="**/**"/>
-        </uptodate>
-    </target>
-    <target name="js-if-needed" depends="check-js" unless="js-not-needed">
+    <target name="compile-js">
         <ant dir="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/" inheritAll="false" />
     </target>
     
+    <target name="copy-swc">
+        <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
+    </target>
+    
     <target name="check-for-tests" >
         <condition property="skip-tests" >
             <not>
@@ -75,8 +74,6 @@
         <echo message="Compiling libs/${ant.project.name}.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}/target/generated-sources/flexjs" />
         
         <compc fork="true"
             output="${basedir}/target/${target.name}">

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Effects/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/pom.xml b/frameworks/projects/Effects/pom.xml
index f993c99..eab99ae 100644
--- a/frameworks/projects/Effects/pom.xml
+++ b/frameworks/projects/Effects/pom.xml
@@ -50,12 +50,6 @@
           <includeClasses>
             <includeClass>EffectsClasses</includeClass>
           </includeClasses>
-          <includeFiles>
-            <include-file>
-              <name>js/out/*</name>
-              <path>generated-sources/flexjs/*</path>
-            </include-file>
-          </includeFiles>
         </configuration>
       </plugin>
     </plugins>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/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 7b304e4..f5bd6ba 100644
--- a/frameworks/projects/Effects/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Effects/src/main/config/compile-as-config.xml
@@ -59,11 +59,6 @@
         <warn-no-constructor>false</warn-no-constructor>
     </compiler>
     
-    <include-file>
-        <name>js/out/*</name>
-        <path>../../../../../js/FlexJS/projects/EffectsJS/target/generated-sources/flexjs/*</path>
-    </include-file>
-
     <include-classes>
         <class>EffectsClasses</class>
     </include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Flat/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/build.xml b/frameworks/projects/Flat/build.xml
index e4fc097..3c9e5da 100644
--- a/frameworks/projects/Flat/build.xml
+++ b/frameworks/projects/Flat/build.xml
@@ -29,18 +29,17 @@
     
     <property name="target.name" value="${ant.project.name}.swc" />
     
-    <target name="main" depends="clean,check-compiler,js-if-needed,compile,test" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc">
     </target>
     
-    <target name="check-js">
-        <uptodate property="js-not-needed" targetfile="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/target/${ant.project.name}JS.swc">
-            <srcfiles dir="${basedir}/src/main/flex" includes="**/**"/>
-        </uptodate>
-    </target>
-    <target name="js-if-needed" depends="check-js" unless="js-not-needed">
+    <target name="compile-js">
         <ant dir="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/" inheritAll="false" />
     </target>
     
+    <target name="copy-swc">
+        <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
+    </target>
+    
     <target name="check-for-tests" >
         <condition property="skip-tests" >
             <not>
@@ -75,8 +74,6 @@
         <echo message="Compiling libs/${ant.project.name}.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}/target/generated-sources/flexjs" />
         
         <compc fork="true"
             output="${basedir}/target/${target.name}">

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Flat/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/pom.xml b/frameworks/projects/Flat/pom.xml
index 511cc2f..36f8fee 100644
--- a/frameworks/projects/Flat/pom.xml
+++ b/frameworks/projects/Flat/pom.xml
@@ -60,10 +60,6 @@
               <name>defaults.css</name>
               <path>../src/main/resources/defaults.css</path>
             </include-file>
-            <include-file>
-              <name>js/out/*</name>
-              <path>generated-sources/flexjs/*</path>
-            </include-file>
           </includeFiles>
           <includeLookupOnly>true</includeLookupOnly>
         </configuration>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/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 3fb7880..8ee2592 100644
--- a/frameworks/projects/Flat/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Flat/src/main/config/compile-as-config.xml
@@ -70,10 +70,6 @@
         <name>defaults.css</name>
         <path>../resources/defaults.css</path>
     </include-file>
-    <include-file>
-        <name>js/out/*</name>
-        <path>../../../../../js/FlexJS/projects/FlatJS/target/generated-sources/flexjs/*</path>
-    </include-file>
 
     <include-lookup-only>true</include-lookup-only>
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Formatters/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Formatters/build.xml b/frameworks/projects/Formatters/build.xml
index daf0972..dfaf8ec 100644
--- a/frameworks/projects/Formatters/build.xml
+++ b/frameworks/projects/Formatters/build.xml
@@ -29,18 +29,17 @@
     
     <property name="target.name" value="${ant.project.name}.swc" />
     
-    <target name="main" depends="clean,check-compiler,js-if-needed,compile,test" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc">
     </target>
     
-    <target name="check-js">
-        <uptodate property="js-not-needed" targetfile="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/target/${ant.project.name}JS.swc">
-            <srcfiles dir="${basedir}/src/main/flex" includes="**/**"/>
-        </uptodate>
-    </target>
-    <target name="js-if-needed" depends="check-js" unless="js-not-needed">
+    <target name="compile-js">
         <ant dir="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/" inheritAll="false" />
     </target>
     
+    <target name="copy-swc">
+        <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
+    </target>
+    
     <target name="check-for-tests" >
         <condition property="skip-tests" >
             <not>
@@ -75,8 +74,6 @@
         <echo message="Compiling libs/${ant.project.name}.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}/target/generated-sources/flexjs" />
         
         <compc fork="true"
             output="${basedir}/target/${target.name}">

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Formatters/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Formatters/pom.xml b/frameworks/projects/Formatters/pom.xml
index 417c4db..8fd94d0 100644
--- a/frameworks/projects/Formatters/pom.xml
+++ b/frameworks/projects/Formatters/pom.xml
@@ -50,12 +50,6 @@
           <includeClasses>
             <includeClass>FormattersClasses</includeClass>
           </includeClasses>
-          <includeFiles>
-            <include-file>
-              <name>js/out/*</name>
-              <path>generated-sources/flexjs/*</path>
-            </include-file>
-          </includeFiles>
         </configuration>
       </plugin>
     </plugins>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/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 a6fcfbb..f1b67ad 100644
--- a/frameworks/projects/Formatters/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Formatters/src/main/config/compile-as-config.xml
@@ -60,11 +60,6 @@
         <warn-no-constructor>false</warn-no-constructor>
     </compiler>
     
-    <include-file>
-        <name>js/out/*</name>
-        <path>../../../../../js/FlexJS/projects/FormattersJS/target/generated-sources/flexjs/*</path>
-    </include-file>
-
     <include-classes>
         <class>FormattersClasses</class>
     </include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/GoogleMaps/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/build.xml b/frameworks/projects/GoogleMaps/build.xml
index 50484bc..dbfd669 100644
--- a/frameworks/projects/GoogleMaps/build.xml
+++ b/frameworks/projects/GoogleMaps/build.xml
@@ -29,18 +29,17 @@
     
     <property name="target.name" value="${ant.project.name}.swc" />
     
-    <target name="main" depends="clean,check-compiler,js-if-needed,compile,test" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc">
     </target>
     
-    <target name="check-js">
-        <uptodate property="js-not-needed" targetfile="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/target/${ant.project.name}JS.swc">
-            <srcfiles dir="${basedir}/src/main/flex" includes="**/**"/>
-        </uptodate>
-    </target>
-    <target name="js-if-needed" depends="check-js" unless="js-not-needed">
+    <target name="compile-js">
         <ant dir="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/" inheritAll="false" />
     </target>
     
+    <target name="copy-swc">
+        <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
+    </target>
+    
     <target name="check-for-tests" >
         <condition property="skip-tests" >
             <not>
@@ -75,8 +74,6 @@
         <echo message="Compiling libs/${ant.project.name}.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}/target/generated-sources/flexjs" />
         
         <compc fork="true"
             output="${basedir}/target/${target.name}">

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/GoogleMaps/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/pom.xml b/frameworks/projects/GoogleMaps/pom.xml
index f4bce2a..915bab7 100644
--- a/frameworks/projects/GoogleMaps/pom.xml
+++ b/frameworks/projects/GoogleMaps/pom.xml
@@ -56,10 +56,6 @@
               <name>defaults.css</name>
               <path>../src/main/resources/defaults.css</path>
             </include-file>
-            <include-file>
-              <name>js/out/*</name>
-              <path>generated-sources/flexjs/*</path>
-            </include-file>
           </includeFiles>
         </configuration>
       </plugin>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/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 e2bb1cb..e94188a 100644
--- a/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml
@@ -63,10 +63,6 @@
         <name>defaults.css</name>
         <path>../resources/defaults.css</path>
     </include-file>
-    <include-file>
-        <name>js/out/*</name>
-        <path>../../../../../js/FlexJS/projects/GoogleMapsJS/target/generated-sources/flexjs/*</path>
-    </include-file>
 
     <include-classes>
         <class>GoogleStubClasses</class>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Graphics/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/build.xml b/frameworks/projects/Graphics/build.xml
index df5f5f2..b47b813 100644
--- a/frameworks/projects/Graphics/build.xml
+++ b/frameworks/projects/Graphics/build.xml
@@ -29,18 +29,17 @@
     
     <property name="target.name" value="${ant.project.name}.swc" />
     
-    <target name="main" depends="clean,check-compiler,js-if-needed,compile,test" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc">
     </target>
     
-    <target name="check-js">
-        <uptodate property="js-not-needed" targetfile="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/target/${ant.project.name}JS.swc">
-            <srcfiles dir="${basedir}/src/main/flex" includes="**/**"/>
-        </uptodate>
-    </target>
-    <target name="js-if-needed" depends="check-js" unless="js-not-needed">
+    <target name="compile-js">
         <ant dir="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/" inheritAll="false" />
     </target>
     
+    <target name="copy-swc">
+        <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
+    </target>
+    
     <target name="check-for-tests" >
         <condition property="skip-tests" >
             <not>
@@ -75,8 +74,6 @@
         <echo message="Compiling libs/${ant.project.name}.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}/target/generated-sources/flexjs" />
         
         <compc fork="true"
             output="${basedir}/target/${target.name}">

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Graphics/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/pom.xml b/frameworks/projects/Graphics/pom.xml
index 52caac8..75d7339 100644
--- a/frameworks/projects/Graphics/pom.xml
+++ b/frameworks/projects/Graphics/pom.xml
@@ -54,12 +54,6 @@
           <includeClasses>
             <includeClass>GraphicsClasses</includeClass>
           </includeClasses>
-          <includeFiles>
-            <include-file>
-              <name>js/out/*</name>
-              <path>generated-sources/flexjs/*</path>
-            </include-file>
-          </includeFiles>
         </configuration>
       </plugin>
     </plugins>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/Graphics/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/src/main/config/compile-as-config.xml b/frameworks/projects/Graphics/src/main/config/compile-as-config.xml
index c05225f..765ccbe 100644
--- a/frameworks/projects/Graphics/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Graphics/src/main/config/compile-as-config.xml
@@ -59,11 +59,6 @@
         <warn-no-constructor>false</warn-no-constructor>
     </compiler>
     
-    <include-file>
-        <name>js/out/*</name>
-        <path>../../../../../js/FlexJS/projects/GraphicsJS/target/generated-sources/flexjs/*</path>
-    </include-file>
-
     <include-classes>
         <class>GraphicsClasses</class>
     </include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/HTML/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/build.xml b/frameworks/projects/HTML/build.xml
index 5fb4679..5ee6dd8 100644
--- a/frameworks/projects/HTML/build.xml
+++ b/frameworks/projects/HTML/build.xml
@@ -29,18 +29,17 @@
     
     <property name="target.name" value="${ant.project.name}.swc" />
     
-    <target name="main" depends="clean,check-compiler,js-if-needed,compile,test" description="Full build of ${ant.project.name}.swc">
+    <target name="main" depends="clean,check-compiler,compile,compile-js,copy-swc,test" description="Full build of ${ant.project.name}.swc">
     </target>
     
-    <target name="check-js">
-        <uptodate property="js-not-needed" targetfile="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/target/${ant.project.name}JS.swc">
-            <srcfiles dir="${basedir}/src/main/flex" includes="**/**"/>
-        </uptodate>
-    </target>
-    <target name="js-if-needed" depends="check-js" unless="js-not-needed">
+    <target name="compile-js">
         <ant dir="${FLEXJS_HOME}/frameworks/js/FlexJS/projects/${ant.project.name}JS/" inheritAll="false" />
     </target>
     
+    <target name="copy-swc">
+        <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
+    </target>
+    
     <target name="check-for-tests" >
         <condition property="skip-tests" >
             <not>
@@ -75,8 +74,6 @@
         <echo message="Compiling libs/${ant.project.name}.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}/target/generated-sources/flexjs" />
         
         <compc fork="true"
             output="${basedir}/target/${target.name}">

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/HTML/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/pom.xml b/frameworks/projects/HTML/pom.xml
index 613755a..5eab490 100644
--- a/frameworks/projects/HTML/pom.xml
+++ b/frameworks/projects/HTML/pom.xml
@@ -64,10 +64,6 @@
               <name>defaults.css</name>
               <path>../src/main/resources/defaults.css</path>
             </include-file>
-            <include-file>
-              <name>js/out/*</name>
-              <path>generated-sources/flexjs/*</path>
-            </include-file>
           </includeFiles>
         </configuration>
       </plugin>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8d8c48b/frameworks/projects/HTML/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/config/compile-as-config.xml b/frameworks/projects/HTML/src/main/config/compile-as-config.xml
index 70f5fd0..7b1c242 100644
--- a/frameworks/projects/HTML/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/HTML/src/main/config/compile-as-config.xml
@@ -74,10 +74,6 @@
         <name>defaults.css</name>
         <path>../resources/defaults.css</path>
     </include-file>
-    <include-file>
-        <name>js/out/*</name>
-        <path>../../../../../js/FlexJS/projects/HTMLJS/target/generated-sources/flexjs/*</path>
-    </include-file>
 
     <include-classes>
         <class>HTMLClasses</class>


Mime
View raw message