flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [07/24] git commit: [flex-asjs] [refs/heads/packaging] - get build to skip SWF output if no env.AIR_HOME
Date Fri, 22 Sep 2017 05:47:38 GMT
get build to skip SWF output if no env.AIR_HOME


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

Branch: refs/heads/packaging
Commit: c4184c405fcddad51f79dd689de16ca2343f685c
Parents: 21af417
Author: Alex Harui <aharui@apache.org>
Authored: Fri Sep 15 14:27:12 2017 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Fri Sep 15 14:27:12 2017 -0700

----------------------------------------------------------------------
 frameworks/build.xml                            |  4 +-
 frameworks/projects/Basic/build.xml             | 44 ++++++++------------
 frameworks/projects/Binding/build.xml           | 39 ++++++-----------
 frameworks/projects/Charts/build.xml            | 39 ++++++-----------
 frameworks/projects/Collections/build.xml       | 39 ++++++-----------
 frameworks/projects/Core/build.xml              | 39 ++++++-----------
 frameworks/projects/CreateJS/build.xml          | 41 ++++++------------
 frameworks/projects/DragDrop/build.xml          | 39 ++++++-----------
 frameworks/projects/Effects/build.xml           | 39 ++++++-----------
 frameworks/projects/Express/build.xml           | 39 ++++++-----------
 frameworks/projects/Flat/build.xml              | 39 ++++++-----------
 frameworks/projects/FontAwesome/build.xml       | 39 ++++++-----------
 frameworks/projects/Formatters/build.xml        | 41 ++++++------------
 frameworks/projects/GoogleMaps/build.xml        | 39 ++++++-----------
 frameworks/projects/Graphics/build.xml          | 40 ++++++------------
 frameworks/projects/HTML/build.xml              | 39 ++++++-----------
 frameworks/projects/HTML5/build.xml             | 41 ++++++------------
 frameworks/projects/JQuery/build.xml            | 41 ++++++------------
 frameworks/projects/Language/build.xml          | 41 ++++++------------
 .../projects/MaterialDesignLite/build.xml       | 39 ++++++-----------
 frameworks/projects/Mobile/build.xml            | 39 ++++++-----------
 frameworks/projects/Network/build.xml           | 41 ++++++------------
 frameworks/projects/Reflection/build.xml        | 41 ++++++------------
 frameworks/projects/Storage/build.xml           | 39 ++++++-----------
 frameworks/projects/TLF/build.xml               | 42 ++++++-------------
 frameworks/projects/Text/build.xml              | 39 ++++++-----------
 frameworks/projects/XML/build.xml               | 39 ++++++-----------
 27 files changed, 327 insertions(+), 714 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4184c40/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index 668b4c4..d2d1408 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -87,12 +87,12 @@
 
     <target name="fake-playerglobal" description="copy js.swc as playerglobal.swc if needed" depends="check-playerglobal" unless="playerglobal.notneeded">
         <mkdir dir="${basedir}/libs/player/${playerglobal.version}"/>
-        <copy dir="${basedir}/js/libs/js.swc" tofile="${basedir}/libs/player/${playerglobal.version}/playerglobal.swc" />
+        <copy file="${FLEX_HOME}/js/libs/js.swc" tofile="${basedir}/libs/player/${playerglobal.version}/playerglobal.swc" />
     </target>
 
     <target name="fake-airglobal" description="copy js.swc as airglobal.swc if needed" depends="check-airglobal" unless="airglobal.notneeded">
         <mkdir dir="${basedir}/libs/air"/>
-        <copy dir="${basedir}/js/libs/js.swc" tofile="${basedir}/libs/air/airglobal.swc" />
+        <copy file="${FLEX_HOME}/js/libs/js.swc" tofile="${basedir}/libs/air/airglobal.swc" />
     </target>
 
     <target name="prepare" depends="thirdparty-downloads">

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4184c40/frameworks/projects/Basic/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/build.xml b/frameworks/projects/Basic/build.xml
index b131320..759a240 100644
--- a/frameworks/projects/Basic/build.xml
+++ b/frameworks/projects/Basic/build.xml
@@ -40,7 +40,7 @@
         </ant>
     </target>
     
-    <target name="copy-swc">
+    <target name="copy-swc" if="env.AIR_HOME">
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
     </target>
     
@@ -50,6 +50,11 @@
                 <available file="${basedir}/src/test/flex/build.xml" />
             </not>
         </condition>
+        <condition property="skip-tests" >
+            <not>
+                <isset property="env.AIR_HOME" />
+            </not>
+        </condition>
     </target>
     
     <target name="test" depends="check-for-tests" unless="skip-tests">
@@ -74,7 +79,7 @@
         <ant dir="src/test/flex" target="clean"/>
     </target>
     
-    <target name="compile" description="Compiles .as files into .swc">
+    <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
@@ -83,8 +88,7 @@
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <jvmarg value="-Dflexlib=${FLEX_HOME}/frameworks" />
             <arg value="+flexlib=${FLEX_HOME}/frameworks" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
@@ -104,39 +108,25 @@
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
     </target>
     
-    <target name="check-falcon-home" unless="FALCON_HOME"
-        description="Check FALCON_HOME is a directory.">
-        
-        <echo message="FALCON_HOME is ${env.FALCON_HOME}"/>
-        
-        <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${env.FALCON_HOME}"/>
+    <target name="check-falcon-home"
+        description="Set FALCON_HOME to point at the compiler.">
         
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
+        <available file="${FLEXJS_HOME}/lib/falcon-mxmlc.jar"
         type="file"
         property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
+        value="${FLEXJS_HOME}"/>
         
-        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or the root of a FlexJS SDK"
         unless="FALCON_HOME"/>
     </target>
     
-    <target name="check-falconjx-home" unless="FALCONJX_HOME"
-        description="Check FALCON_HOME is a directory.">
-        
-        <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
-        
-        <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
-        type="file"
-        property="FALCONJX_HOME"
-        value="${env.FALCONJX_HOME}"/>
+    <target name="check-falconjx-home"
+        description="Set FALCONJX_HOME to point at the cross-compiler.">
         
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar"
+        <available file="${FLEXJS_HOME}/js/lib/jsc.jar"
         type="file"
         property="FALCONJX_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/>
+        value="${FLEXJS_HOME}/js"/>
         
         <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK"
         unless="FALCONJX_HOME"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4184c40/frameworks/projects/Binding/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/build.xml b/frameworks/projects/Binding/build.xml
index 016b125..9398cad 100644
--- a/frameworks/projects/Binding/build.xml
+++ b/frameworks/projects/Binding/build.xml
@@ -40,7 +40,7 @@
         </ant>
     </target>
     
-    <target name="copy-swc">
+    <target name="copy-swc" if="env.AIR_HOME">
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
     </target>
     
@@ -74,7 +74,7 @@
         <ant dir="src/test/flex" target="clean"/>
     </target>
     
-    <target name="compile" description="Compiles .as files into .swc">
+    <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
@@ -83,8 +83,7 @@
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <jvmarg value="-Dflexlib=${FLEX_HOME}/frameworks" />
             <arg value="+flexlib=${FLEX_HOME}/frameworks" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
@@ -104,39 +103,25 @@
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
     </target>
     
-    <target name="check-falcon-home" unless="FALCON_HOME"
-        description="Check FALCON_HOME is a directory.">
+    <target name="check-falcon-home"
+        description="Set FALCON_HOME to point at the compiler.">
         
-        <echo message="FALCON_HOME is ${env.FALCON_HOME}"/>
-        
-        <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${env.FALCON_HOME}"/>
-        
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
+        <available file="${FLEXJS_HOME}/lib/falcon-mxmlc.jar"
         type="file"
         property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
+        value="${FLEXJS_HOME}"/>
         
-        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or the root of a FlexJS SDK"
         unless="FALCON_HOME"/>
     </target>
     
-    <target name="check-falconjx-home" unless="FALCONJX_HOME"
-        description="Check FALCON_HOME is a directory.">
-        
-        <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
-        
-        <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
-        type="file"
-        property="FALCONJX_HOME"
-        value="${env.FALCONJX_HOME}"/>
+    <target name="check-falconjx-home"
+        description="Set FALCONJX_HOME to point at the cross-compiler.">
         
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar"
+        <available file="${FLEXJS_HOME}/js/lib/jsc.jar"
         type="file"
         property="FALCONJX_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/>
+        value="${FLEXJS_HOME}/js"/>
         
         <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK"
         unless="FALCONJX_HOME"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4184c40/frameworks/projects/Charts/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/build.xml b/frameworks/projects/Charts/build.xml
index c0b7ea7..bbeea86 100644
--- a/frameworks/projects/Charts/build.xml
+++ b/frameworks/projects/Charts/build.xml
@@ -40,7 +40,7 @@
         </ant>
     </target>
     
-    <target name="copy-swc">
+    <target name="copy-swc" if="env.AIR_HOME">
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
     </target>
     
@@ -74,7 +74,7 @@
         <ant dir="src/test/flex" target="clean"/>
     </target>
     
-    <target name="compile" description="Compiles .as files into .swc">
+    <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
@@ -83,8 +83,7 @@
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <jvmarg value="-Dflexlib=${FLEX_HOME}/frameworks" />
             <arg value="+flexlib=${FLEX_HOME}/frameworks" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
@@ -104,39 +103,25 @@
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
     </target>
     
-    <target name="check-falcon-home" unless="FALCON_HOME"
-        description="Check FALCON_HOME is a directory.">
+    <target name="check-falcon-home"
+        description="Set FALCON_HOME to point at the compiler.">
         
-        <echo message="FALCON_HOME is ${env.FALCON_HOME}"/>
-        
-        <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${env.FALCON_HOME}"/>
-        
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
+        <available file="${FLEXJS_HOME}/lib/falcon-mxmlc.jar"
         type="file"
         property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
+        value="${FLEXJS_HOME}"/>
         
-        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or the root of a FlexJS SDK"
         unless="FALCON_HOME"/>
     </target>
     
-    <target name="check-falconjx-home" unless="FALCONJX_HOME"
-        description="Check FALCON_HOME is a directory.">
-        
-        <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
-        
-        <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
-        type="file"
-        property="FALCONJX_HOME"
-        value="${env.FALCONJX_HOME}"/>
+    <target name="check-falconjx-home"
+        description="Set FALCONJX_HOME to point at the cross-compiler.">
         
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar"
+        <available file="${FLEXJS_HOME}/js/lib/jsc.jar"
         type="file"
         property="FALCONJX_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/>
+        value="${FLEXJS_HOME}/js"/>
         
         <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK"
         unless="FALCONJX_HOME"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4184c40/frameworks/projects/Collections/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/build.xml b/frameworks/projects/Collections/build.xml
index faea5d2..71123f9 100644
--- a/frameworks/projects/Collections/build.xml
+++ b/frameworks/projects/Collections/build.xml
@@ -40,7 +40,7 @@
         </ant>
     </target>
     
-    <target name="copy-swc">
+    <target name="copy-swc" if="env.AIR_HOME">
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
     </target>
     
@@ -74,7 +74,7 @@
         <ant dir="src/test/flex" target="clean"/>
     </target>
     
-    <target name="compile" description="Compiles .as files into .swc">
+    <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
@@ -83,8 +83,7 @@
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <jvmarg value="-Dflexlib=${FLEX_HOME}/frameworks" />
             <arg value="+flexlib=${FLEX_HOME}/frameworks" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
@@ -104,39 +103,25 @@
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
     </target>
     
-    <target name="check-falcon-home" unless="FALCON_HOME"
-        description="Check FALCON_HOME is a directory.">
+    <target name="check-falcon-home"
+        description="Set FALCON_HOME to point at the compiler.">
         
-        <echo message="FALCON_HOME is ${env.FALCON_HOME}"/>
-        
-        <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${env.FALCON_HOME}"/>
-        
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
+        <available file="${FLEXJS_HOME}/lib/falcon-mxmlc.jar"
         type="file"
         property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
+        value="${FLEXJS_HOME}"/>
         
-        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or the root of a FlexJS SDK"
         unless="FALCON_HOME"/>
     </target>
     
-    <target name="check-falconjx-home" unless="FALCONJX_HOME"
-        description="Check FALCON_HOME is a directory.">
-        
-        <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
-        
-        <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
-        type="file"
-        property="FALCONJX_HOME"
-        value="${env.FALCONJX_HOME}"/>
+    <target name="check-falconjx-home"
+        description="Set FALCONJX_HOME to point at the cross-compiler.">
         
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar"
+        <available file="${FLEXJS_HOME}/js/lib/jsc.jar"
         type="file"
         property="FALCONJX_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/>
+        value="${FLEXJS_HOME}/js"/>
         
         <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK"
         unless="FALCONJX_HOME"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4184c40/frameworks/projects/Core/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/build.xml b/frameworks/projects/Core/build.xml
index 8025ec3..8776959 100644
--- a/frameworks/projects/Core/build.xml
+++ b/frameworks/projects/Core/build.xml
@@ -40,7 +40,7 @@
         </ant>
     </target>
     
-    <target name="copy-swc">
+    <target name="copy-swc" if="env.AIR_HOME">
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
     </target>
     
@@ -74,7 +74,7 @@
         <ant dir="src/test/flex" target="clean"/>
     </target>
     
-    <target name="compile" description="Compiles .as files into .swc">
+    <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
@@ -83,8 +83,7 @@
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <jvmarg value="-Dflexlib=${FLEX_HOME}/frameworks" />
             <arg value="+flexlib=${FLEX_HOME}/frameworks" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
@@ -104,39 +103,25 @@
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
     </target>
     
-    <target name="check-falcon-home" unless="FALCON_HOME"
-        description="Check FALCON_HOME is a directory.">
+    <target name="check-falcon-home"
+        description="Set FALCON_HOME to point at the compiler.">
         
-        <echo message="FALCON_HOME is ${env.FALCON_HOME}"/>
-        
-        <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${env.FALCON_HOME}"/>
-        
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
+        <available file="${FLEXJS_HOME}/lib/falcon-mxmlc.jar"
         type="file"
         property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
+        value="${FLEXJS_HOME}"/>
         
-        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or the root of a FlexJS SDK"
         unless="FALCON_HOME"/>
     </target>
     
-    <target name="check-falconjx-home" unless="FALCONJX_HOME"
-        description="Check FALCON_HOME is a directory.">
-        
-        <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
-        
-        <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
-        type="file"
-        property="FALCONJX_HOME"
-        value="${env.FALCONJX_HOME}"/>
+    <target name="check-falconjx-home"
+        description="Set FALCONJX_HOME to point at the cross-compiler.">
         
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar"
+        <available file="${FLEXJS_HOME}/js/lib/jsc.jar"
         type="file"
         property="FALCONJX_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/>
+        value="${FLEXJS_HOME}/js"/>
         
         <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK"
         unless="FALCONJX_HOME"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4184c40/frameworks/projects/CreateJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/build.xml b/frameworks/projects/CreateJS/build.xml
index b347130..f3b8cb3 100644
--- a/frameworks/projects/CreateJS/build.xml
+++ b/frameworks/projects/CreateJS/build.xml
@@ -40,7 +40,7 @@
         </ant>
     </target>
     
-    <target name="copy-swc">
+    <target name="copy-swc" if="env.AIR_HOME">
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
     </target>
     
@@ -74,7 +74,7 @@
         <ant dir="src/test/flex" target="clean"/>
     </target>
     
-    <target name="compile" description="Compiles .as files into .swc">
+    <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
@@ -83,8 +83,7 @@
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <jvmarg value="-Dflexlib=${FLEX_HOME}/frameworks" />
             <arg value="+flexlib=${FLEX_HOME}/frameworks" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
@@ -92,7 +91,7 @@
             <arg value="-compiler.targets=SWF,JSFlex" />
             <arg value="-output=${basedir}/target/${target.name}" />
             <arg value="-load-config=${basedir}/src/main/config/compile-swf-config.xml" />
-            <arg value="-js-load-config=${FLEX_HOME}/frameworks/createjs-config.xml" />
+            <arg value="-js-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
             <arg value="-js-load-config+=${basedir}/../../js/FlexJS/projects/${ant.project.name}JS/src/main/config/compile-js-config.xml" />
         </java>
     </target>
@@ -104,39 +103,25 @@
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
     </target>
     
-    <target name="check-falcon-home" unless="FALCON_HOME"
-        description="Check FALCON_HOME is a directory.">
+    <target name="check-falcon-home"
+        description="Set FALCON_HOME to point at the compiler.">
         
-        <echo message="FALCON_HOME is ${env.FALCON_HOME}"/>
-        
-        <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${env.FALCON_HOME}"/>
-        
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
+        <available file="${FLEXJS_HOME}/lib/falcon-mxmlc.jar"
         type="file"
         property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
+        value="${FLEXJS_HOME}"/>
         
-        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or the root of a FlexJS SDK"
         unless="FALCON_HOME"/>
     </target>
     
-    <target name="check-falconjx-home" unless="FALCONJX_HOME"
-        description="Check FALCON_HOME is a directory.">
-        
-        <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
-        
-        <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
-        type="file"
-        property="FALCONJX_HOME"
-        value="${env.FALCONJX_HOME}"/>
+    <target name="check-falconjx-home"
+        description="Set FALCONJX_HOME to point at the cross-compiler.">
         
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar"
+        <available file="${FLEXJS_HOME}/js/lib/jsc.jar"
         type="file"
         property="FALCONJX_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/>
+        value="${FLEXJS_HOME}/js"/>
         
         <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK"
         unless="FALCONJX_HOME"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4184c40/frameworks/projects/DragDrop/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/build.xml b/frameworks/projects/DragDrop/build.xml
index 2111f07..4fed183 100644
--- a/frameworks/projects/DragDrop/build.xml
+++ b/frameworks/projects/DragDrop/build.xml
@@ -40,7 +40,7 @@
         </ant>
     </target>
     
-    <target name="copy-swc">
+    <target name="copy-swc" if="env.AIR_HOME">
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
     </target>
     
@@ -74,7 +74,7 @@
         <ant dir="src/test/flex" target="clean"/>
     </target>
     
-    <target name="compile" description="Compiles .as files into .swc">
+    <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
@@ -83,8 +83,7 @@
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <jvmarg value="-Dflexlib=${FLEX_HOME}/frameworks" />
             <arg value="+flexlib=${FLEX_HOME}/frameworks" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
@@ -104,39 +103,25 @@
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
     </target>
     
-    <target name="check-falcon-home" unless="FALCON_HOME"
-        description="Check FALCON_HOME is a directory.">
+    <target name="check-falcon-home"
+        description="Set FALCON_HOME to point at the compiler.">
         
-        <echo message="FALCON_HOME is ${env.FALCON_HOME}"/>
-        
-        <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${env.FALCON_HOME}"/>
-        
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
+        <available file="${FLEXJS_HOME}/lib/falcon-mxmlc.jar"
         type="file"
         property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
+        value="${FLEXJS_HOME}"/>
         
-        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or the root of a FlexJS SDK"
         unless="FALCON_HOME"/>
     </target>
     
-    <target name="check-falconjx-home" unless="FALCONJX_HOME"
-        description="Check FALCON_HOME is a directory.">
-        
-        <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
-        
-        <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
-        type="file"
-        property="FALCONJX_HOME"
-        value="${env.FALCONJX_HOME}"/>
+    <target name="check-falconjx-home"
+        description="Set FALCONJX_HOME to point at the cross-compiler.">
         
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar"
+        <available file="${FLEXJS_HOME}/js/lib/jsc.jar"
         type="file"
         property="FALCONJX_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/>
+        value="${FLEXJS_HOME}/js"/>
         
         <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK"
         unless="FALCONJX_HOME"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4184c40/frameworks/projects/Effects/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/build.xml b/frameworks/projects/Effects/build.xml
index 4682191..3605a6a 100644
--- a/frameworks/projects/Effects/build.xml
+++ b/frameworks/projects/Effects/build.xml
@@ -40,7 +40,7 @@
         </ant>
     </target>
     
-    <target name="copy-swc">
+    <target name="copy-swc" if="env.AIR_HOME">
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
     </target>
     
@@ -74,7 +74,7 @@
         <ant dir="src/test/flex" target="clean"/>
     </target>
     
-    <target name="compile" description="Compiles .as files into .swc">
+    <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
@@ -83,8 +83,7 @@
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <jvmarg value="-Dflexlib=${FLEX_HOME}/frameworks" />
             <arg value="+flexlib=${FLEX_HOME}/frameworks" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
@@ -104,39 +103,25 @@
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
     </target>
     
-    <target name="check-falcon-home" unless="FALCON_HOME"
-        description="Check FALCON_HOME is a directory.">
+    <target name="check-falcon-home"
+        description="Set FALCON_HOME to point at the compiler.">
         
-        <echo message="FALCON_HOME is ${env.FALCON_HOME}"/>
-        
-        <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${env.FALCON_HOME}"/>
-        
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
+        <available file="${FLEXJS_HOME}/lib/falcon-mxmlc.jar"
         type="file"
         property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
+        value="${FLEXJS_HOME}"/>
         
-        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or the root of a FlexJS SDK"
         unless="FALCON_HOME"/>
     </target>
     
-    <target name="check-falconjx-home" unless="FALCONJX_HOME"
-        description="Check FALCON_HOME is a directory.">
-        
-        <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
-        
-        <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
-        type="file"
-        property="FALCONJX_HOME"
-        value="${env.FALCONJX_HOME}"/>
+    <target name="check-falconjx-home"
+        description="Set FALCONJX_HOME to point at the cross-compiler.">
         
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar"
+        <available file="${FLEXJS_HOME}/js/lib/jsc.jar"
         type="file"
         property="FALCONJX_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/>
+        value="${FLEXJS_HOME}/js"/>
         
         <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK"
         unless="FALCONJX_HOME"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4184c40/frameworks/projects/Express/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/build.xml b/frameworks/projects/Express/build.xml
index 1b120a6..6a906b2 100644
--- a/frameworks/projects/Express/build.xml
+++ b/frameworks/projects/Express/build.xml
@@ -40,7 +40,7 @@
         </ant>
     </target>
     
-    <target name="copy-swc">
+    <target name="copy-swc" if="env.AIR_HOME">
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
     </target>
     
@@ -74,7 +74,7 @@
         <ant dir="src/test/flex" target="clean"/>
     </target>
     
-    <target name="compile" description="Compiles .as files into .swc">
+    <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
@@ -83,8 +83,7 @@
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <jvmarg value="-Dflexlib=${FLEX_HOME}/frameworks" />
             <arg value="+flexlib=${FLEX_HOME}/frameworks" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
@@ -104,39 +103,25 @@
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
     </target>
     
-    <target name="check-falcon-home" unless="FALCON_HOME"
-        description="Check FALCON_HOME is a directory.">
+    <target name="check-falcon-home"
+        description="Set FALCON_HOME to point at the compiler.">
         
-        <echo message="FALCON_HOME is ${env.FALCON_HOME}"/>
-        
-        <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${env.FALCON_HOME}"/>
-        
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
+        <available file="${FLEXJS_HOME}/lib/falcon-mxmlc.jar"
         type="file"
         property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
+        value="${FLEXJS_HOME}"/>
         
-        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or the root of a FlexJS SDK"
         unless="FALCON_HOME"/>
     </target>
     
-    <target name="check-falconjx-home" unless="FALCONJX_HOME"
-        description="Check FALCON_HOME is a directory.">
-        
-        <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
-        
-        <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
-        type="file"
-        property="FALCONJX_HOME"
-        value="${env.FALCONJX_HOME}"/>
+    <target name="check-falconjx-home"
+        description="Set FALCONJX_HOME to point at the cross-compiler.">
         
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar"
+        <available file="${FLEXJS_HOME}/js/lib/jsc.jar"
         type="file"
         property="FALCONJX_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/>
+        value="${FLEXJS_HOME}/js"/>
         
         <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK"
         unless="FALCONJX_HOME"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4184c40/frameworks/projects/Flat/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/build.xml b/frameworks/projects/Flat/build.xml
index ebc3cb7..42c60b7 100644
--- a/frameworks/projects/Flat/build.xml
+++ b/frameworks/projects/Flat/build.xml
@@ -40,7 +40,7 @@
         </ant>
     </target>
     
-    <target name="copy-swc">
+    <target name="copy-swc" if="env.AIR_HOME">
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
     </target>
     
@@ -74,7 +74,7 @@
         <ant dir="src/test/flex" target="clean"/>
     </target>
     
-    <target name="compile" description="Compiles .as files into .swc">
+    <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
@@ -83,8 +83,7 @@
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <jvmarg value="-Dflexlib=${FLEX_HOME}/frameworks" />
             <arg value="+flexlib=${FLEX_HOME}/frameworks" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
@@ -104,39 +103,25 @@
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
     </target>
     
-    <target name="check-falcon-home" unless="FALCON_HOME"
-        description="Check FALCON_HOME is a directory.">
+    <target name="check-falcon-home"
+        description="Set FALCON_HOME to point at the compiler.">
         
-        <echo message="FALCON_HOME is ${env.FALCON_HOME}"/>
-        
-        <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${env.FALCON_HOME}"/>
-        
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
+        <available file="${FLEXJS_HOME}/lib/falcon-mxmlc.jar"
         type="file"
         property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
+        value="${FLEXJS_HOME}"/>
         
-        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or the root of a FlexJS SDK"
         unless="FALCON_HOME"/>
     </target>
     
-    <target name="check-falconjx-home" unless="FALCONJX_HOME"
-        description="Check FALCON_HOME is a directory.">
-        
-        <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
-        
-        <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
-        type="file"
-        property="FALCONJX_HOME"
-        value="${env.FALCONJX_HOME}"/>
+    <target name="check-falconjx-home"
+        description="Set FALCONJX_HOME to point at the cross-compiler.">
         
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar"
+        <available file="${FLEXJS_HOME}/js/lib/jsc.jar"
         type="file"
         property="FALCONJX_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/>
+        value="${FLEXJS_HOME}/js"/>
         
         <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK"
         unless="FALCONJX_HOME"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4184c40/frameworks/projects/FontAwesome/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/FontAwesome/build.xml b/frameworks/projects/FontAwesome/build.xml
index bc34164..7ee64fe 100644
--- a/frameworks/projects/FontAwesome/build.xml
+++ b/frameworks/projects/FontAwesome/build.xml
@@ -40,7 +40,7 @@
         </ant>
     </target>
     
-    <target name="copy-swc">
+    <target name="copy-swc" if="env.AIR_HOME">
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
     </target>
     
@@ -74,7 +74,7 @@
         <ant dir="src/test/flex" target="clean"/>
     </target>
     
-    <target name="compile" description="Compiles .as files into .swc">
+    <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
@@ -83,8 +83,7 @@
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <jvmarg value="-Dflexlib=${FLEX_HOME}/frameworks" />
             <arg value="+flexlib=${FLEX_HOME}/frameworks" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
@@ -104,39 +103,25 @@
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
     </target>
     
-    <target name="check-falcon-home" unless="FALCON_HOME"
-        description="Check FALCON_HOME is a directory.">
+    <target name="check-falcon-home"
+        description="Set FALCON_HOME to point at the compiler.">
         
-        <echo message="FALCON_HOME is ${env.FALCON_HOME}"/>
-        
-        <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${env.FALCON_HOME}"/>
-        
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
+        <available file="${FLEXJS_HOME}/lib/falcon-mxmlc.jar"
         type="file"
         property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
+        value="${FLEXJS_HOME}"/>
         
-        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or the root of a FlexJS SDK"
         unless="FALCON_HOME"/>
     </target>
     
-    <target name="check-falconjx-home" unless="FALCONJX_HOME"
-        description="Check FALCON_HOME is a directory.">
-        
-        <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
-        
-        <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
-        type="file"
-        property="FALCONJX_HOME"
-        value="${env.FALCONJX_HOME}"/>
+    <target name="check-falconjx-home"
+        description="Set FALCONJX_HOME to point at the cross-compiler.">
         
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar"
+        <available file="${FLEXJS_HOME}/js/lib/jsc.jar"
         type="file"
         property="FALCONJX_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/>
+        value="${FLEXJS_HOME}/js"/>
         
         <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK"
         unless="FALCONJX_HOME"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4184c40/frameworks/projects/Formatters/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Formatters/build.xml b/frameworks/projects/Formatters/build.xml
index 74b7688..666b73f 100644
--- a/frameworks/projects/Formatters/build.xml
+++ b/frameworks/projects/Formatters/build.xml
@@ -40,7 +40,7 @@
         </ant>
     </target>
     
-    <target name="copy-swc">
+    <target name="copy-swc" if="env.AIR_HOME">
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
     </target>
     
@@ -74,7 +74,7 @@
         <ant dir="src/test/flex" target="clean"/>
     </target>
     
-    <target name="compile" description="Compiles .as files into .swc">
+    <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
@@ -83,8 +83,7 @@
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <jvmarg value="-Dflexlib=${FLEX_HOME}/frameworks" />
             <arg value="+flexlib=${FLEX_HOME}/frameworks" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
@@ -104,42 +103,28 @@
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
     </target>
     
-    <target name="check-falcon-home" unless="FALCON_HOME"
-        description="Check FALCON_HOME is a directory.">
+    <target name="check-falcon-home"
+        description="Set FALCON_HOME to point at the compiler.">
         
-        <echo message="FALCON_HOME is ${env.FALCON_HOME}"/>
-        
-        <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
+        <available file="${FLEXJS_HOME}/lib/falcon-mxmlc.jar"
         type="file"
         property="FALCON_HOME"
-        value="${env.FALCON_HOME}"/>
+        value="${FLEXJS_HOME}"/>
         
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
-        
-        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or the root of a FlexJS SDK"
         unless="FALCON_HOME"/>
     </target>
     
-    <target name="check-falconjx-home" unless="FALCONJX_HOME"
-        description="Check FALCON_HOME is a directory.">
-        
-        <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
+    <target name="check-falconjx-home"
+        description="Set FALCONJX_HOME to point at the cross-compiler.">
         
-        <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
+        <available file="${FLEXJS_HOME}/js/lib/jsc.jar"
         type="file"
         property="FALCONJX_HOME"
-        value="${env.FALCONJX_HOME}"/>
-        
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar"
-        type="file"
-        property="FALCONJX_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/>
+        value="${FLEXJS_HOME}/js"/>
         
         <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK"
         unless="FALCONJX_HOME"/>
     </target>
-
+    
 </project>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4184c40/frameworks/projects/GoogleMaps/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/build.xml b/frameworks/projects/GoogleMaps/build.xml
index a085af5..16f4d64 100644
--- a/frameworks/projects/GoogleMaps/build.xml
+++ b/frameworks/projects/GoogleMaps/build.xml
@@ -40,7 +40,7 @@
         </ant>
     </target>
     
-    <target name="copy-swc">
+    <target name="copy-swc" if="env.AIR_HOME">
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
     </target>
     
@@ -74,7 +74,7 @@
         <ant dir="src/test/flex" target="clean"/>
     </target>
     
-    <target name="compile" description="Compiles .as files into .swc">
+    <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
@@ -83,8 +83,7 @@
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <jvmarg value="-Dflexlib=${FLEX_HOME}/frameworks" />
             <arg value="+flexlib=${FLEX_HOME}/frameworks" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
@@ -104,39 +103,25 @@
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
     </target>
     
-    <target name="check-falcon-home" unless="FALCON_HOME"
-        description="Check FALCON_HOME is a directory.">
+    <target name="check-falcon-home"
+        description="Set FALCON_HOME to point at the compiler.">
         
-        <echo message="FALCON_HOME is ${env.FALCON_HOME}"/>
-        
-        <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${env.FALCON_HOME}"/>
-        
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
+        <available file="${FLEXJS_HOME}/lib/falcon-mxmlc.jar"
         type="file"
         property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
+        value="${FLEXJS_HOME}"/>
         
-        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or the root of a FlexJS SDK"
         unless="FALCON_HOME"/>
     </target>
     
-    <target name="check-falconjx-home" unless="FALCONJX_HOME"
-        description="Check FALCON_HOME is a directory.">
-        
-        <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
-        
-        <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
-        type="file"
-        property="FALCONJX_HOME"
-        value="${env.FALCONJX_HOME}"/>
+    <target name="check-falconjx-home"
+        description="Set FALCONJX_HOME to point at the cross-compiler.">
         
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar"
+        <available file="${FLEXJS_HOME}/js/lib/jsc.jar"
         type="file"
         property="FALCONJX_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/>
+        value="${FLEXJS_HOME}/js"/>
         
         <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK"
         unless="FALCONJX_HOME"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4184c40/frameworks/projects/Graphics/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/build.xml b/frameworks/projects/Graphics/build.xml
index 8ea1758..7bf5ed4 100644
--- a/frameworks/projects/Graphics/build.xml
+++ b/frameworks/projects/Graphics/build.xml
@@ -40,7 +40,7 @@
         </ant>
     </target>
     
-    <target name="copy-swc">
+    <target name="copy-swc" if="env.AIR_HOME">
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
     </target>
     
@@ -74,7 +74,7 @@
         <ant dir="src/test/flex" target="clean"/>
     </target>
     
-    <target name="compile" description="Compiles .as files into .swc">
+    <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
@@ -83,8 +83,7 @@
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <jvmarg value="-Dflexlib=${FLEX_HOME}/frameworks" />
             <arg value="+flexlib=${FLEX_HOME}/frameworks" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
@@ -94,7 +93,6 @@
             <arg value="-load-config=${basedir}/src/main/config/compile-swf-config.xml" />
             <arg value="-js-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
             <arg value="-js-load-config+=${basedir}/../../js/FlexJS/projects/${ant.project.name}JS/src/main/config/compile-js-config.xml" />
-            <arg value="-compiler.byte-array-embed-class=org.apache.flex.core.ByteArrayAsset" />
         </java>
     </target>
     
@@ -105,39 +103,25 @@
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
     </target>
     
-    <target name="check-falcon-home" unless="FALCON_HOME"
-        description="Check FALCON_HOME is a directory.">
+    <target name="check-falcon-home"
+        description="Set FALCON_HOME to point at the compiler.">
         
-        <echo message="FALCON_HOME is ${env.FALCON_HOME}"/>
-        
-        <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${env.FALCON_HOME}"/>
-        
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
+        <available file="${FLEXJS_HOME}/lib/falcon-mxmlc.jar"
         type="file"
         property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
+        value="${FLEXJS_HOME}"/>
         
-        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or the root of a FlexJS SDK"
         unless="FALCON_HOME"/>
     </target>
     
-    <target name="check-falconjx-home" unless="FALCONJX_HOME"
-        description="Check FALCON_HOME is a directory.">
-        
-        <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
-        
-        <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
-        type="file"
-        property="FALCONJX_HOME"
-        value="${env.FALCONJX_HOME}"/>
+    <target name="check-falconjx-home"
+        description="Set FALCONJX_HOME to point at the cross-compiler.">
         
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar"
+        <available file="${FLEXJS_HOME}/js/lib/jsc.jar"
         type="file"
         property="FALCONJX_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/>
+        value="${FLEXJS_HOME}/js"/>
         
         <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK"
         unless="FALCONJX_HOME"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4184c40/frameworks/projects/HTML/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/build.xml b/frameworks/projects/HTML/build.xml
index 0ee0a06..b6ea702 100644
--- a/frameworks/projects/HTML/build.xml
+++ b/frameworks/projects/HTML/build.xml
@@ -40,7 +40,7 @@
         </ant>
     </target>
     
-    <target name="copy-swc">
+    <target name="copy-swc" if="env.AIR_HOME">
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
     </target>
     
@@ -74,7 +74,7 @@
         <ant dir="src/test/flex" target="clean"/>
     </target>
     
-    <target name="compile" description="Compiles .as files into .swc">
+    <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
@@ -83,8 +83,7 @@
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <jvmarg value="-Dflexlib=${FLEX_HOME}/frameworks" />
             <arg value="+flexlib=${FLEX_HOME}/frameworks" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
@@ -104,39 +103,25 @@
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
     </target>
     
-    <target name="check-falcon-home" unless="FALCON_HOME"
-        description="Check FALCON_HOME is a directory.">
+    <target name="check-falcon-home"
+        description="Set FALCON_HOME to point at the compiler.">
         
-        <echo message="FALCON_HOME is ${env.FALCON_HOME}"/>
-        
-        <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${env.FALCON_HOME}"/>
-        
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
+        <available file="${FLEXJS_HOME}/lib/falcon-mxmlc.jar"
         type="file"
         property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
+        value="${FLEXJS_HOME}"/>
         
-        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or the root of a FlexJS SDK"
         unless="FALCON_HOME"/>
     </target>
     
-    <target name="check-falconjx-home" unless="FALCONJX_HOME"
-        description="Check FALCON_HOME is a directory.">
-        
-        <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
-        
-        <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
-        type="file"
-        property="FALCONJX_HOME"
-        value="${env.FALCONJX_HOME}"/>
+    <target name="check-falconjx-home"
+        description="Set FALCONJX_HOME to point at the cross-compiler.">
         
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar"
+        <available file="${FLEXJS_HOME}/js/lib/jsc.jar"
         type="file"
         property="FALCONJX_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/>
+        value="${FLEXJS_HOME}/js"/>
         
         <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK"
         unless="FALCONJX_HOME"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4184c40/frameworks/projects/HTML5/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML5/build.xml b/frameworks/projects/HTML5/build.xml
index 471bef4..016f3b3 100644
--- a/frameworks/projects/HTML5/build.xml
+++ b/frameworks/projects/HTML5/build.xml
@@ -40,7 +40,7 @@
         </ant>
     </target>
     
-    <target name="copy-swc">
+    <target name="copy-swc" if="env.AIR_HOME">
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
     </target>
     
@@ -74,7 +74,7 @@
         <ant dir="src/test/flex" target="clean"/>
     </target>
     
-    <target name="compile" description="Compiles .as files into .swc">
+    <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
@@ -83,8 +83,7 @@
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <jvmarg value="-Dflexlib=${FLEX_HOME}/frameworks" />
             <arg value="+flexlib=${FLEX_HOME}/frameworks" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
@@ -104,42 +103,28 @@
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
     </target>
     
-    <target name="check-falcon-home" unless="FALCON_HOME"
-        description="Check FALCON_HOME is a directory.">
+    <target name="check-falcon-home"
+        description="Set FALCON_HOME to point at the compiler.">
         
-        <echo message="FALCON_HOME is ${env.FALCON_HOME}"/>
-        
-        <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
+        <available file="${FLEXJS_HOME}/lib/falcon-mxmlc.jar"
         type="file"
         property="FALCON_HOME"
-        value="${env.FALCON_HOME}"/>
+        value="${FLEXJS_HOME}"/>
         
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
-        
-        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or the root of a FlexJS SDK"
         unless="FALCON_HOME"/>
     </target>
     
-    <target name="check-falconjx-home" unless="FALCONJX_HOME"
-        description="Check FALCON_HOME is a directory.">
-        
-        <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
+    <target name="check-falconjx-home"
+        description="Set FALCONJX_HOME to point at the cross-compiler.">
         
-        <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
+        <available file="${FLEXJS_HOME}/js/lib/jsc.jar"
         type="file"
         property="FALCONJX_HOME"
-        value="${env.FALCONJX_HOME}"/>
-        
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar"
-        type="file"
-        property="FALCONJX_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/>
+        value="${FLEXJS_HOME}/js"/>
         
         <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK"
         unless="FALCONJX_HOME"/>
     </target>
-
+    
 </project>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4184c40/frameworks/projects/JQuery/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/JQuery/build.xml b/frameworks/projects/JQuery/build.xml
index beb677d..804912c 100644
--- a/frameworks/projects/JQuery/build.xml
+++ b/frameworks/projects/JQuery/build.xml
@@ -40,7 +40,7 @@
         </ant>
     </target>
     
-    <target name="copy-swc">
+    <target name="copy-swc" if="env.AIR_HOME">
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
     </target>
     
@@ -74,7 +74,7 @@
         <ant dir="src/test/flex" target="clean"/>
     </target>
     
-    <target name="compile" description="Compiles .as files into .swc">
+    <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
@@ -83,8 +83,7 @@
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <jvmarg value="-Dflexlib=${FLEX_HOME}/frameworks" />
             <arg value="+flexlib=${FLEX_HOME}/frameworks" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
@@ -92,7 +91,7 @@
             <arg value="-compiler.targets=SWF,JSFlex" />
             <arg value="-output=${basedir}/target/${target.name}" />
             <arg value="-load-config=${basedir}/src/main/config/compile-swf-config.xml" />
-            <arg value="-js-load-config=${FLEX_HOME}/frameworks/jquery-config.xml" />
+            <arg value="-js-load-config=${FLEX_HOME}/frameworks/js-config.xml" />
             <arg value="-js-load-config+=${basedir}/../../js/FlexJS/projects/${ant.project.name}JS/src/main/config/compile-js-config.xml" />
         </java>
     </target>
@@ -104,39 +103,25 @@
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
     </target>
     
-    <target name="check-falcon-home" unless="FALCON_HOME"
-        description="Check FALCON_HOME is a directory.">
+    <target name="check-falcon-home"
+        description="Set FALCON_HOME to point at the compiler.">
         
-        <echo message="FALCON_HOME is ${env.FALCON_HOME}"/>
-        
-        <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${env.FALCON_HOME}"/>
-        
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
+        <available file="${FLEXJS_HOME}/lib/falcon-mxmlc.jar"
         type="file"
         property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
+        value="${FLEXJS_HOME}"/>
         
-        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or the root of a FlexJS SDK"
         unless="FALCON_HOME"/>
     </target>
     
-    <target name="check-falconjx-home" unless="FALCONJX_HOME"
-        description="Check FALCON_HOME is a directory.">
-        
-        <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
-        
-        <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
-        type="file"
-        property="FALCONJX_HOME"
-        value="${env.FALCONJX_HOME}"/>
+    <target name="check-falconjx-home"
+        description="Set FALCONJX_HOME to point at the cross-compiler.">
         
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar"
+        <available file="${FLEXJS_HOME}/js/lib/jsc.jar"
         type="file"
         property="FALCONJX_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/>
+        value="${FLEXJS_HOME}/js"/>
         
         <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK"
         unless="FALCONJX_HOME"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4184c40/frameworks/projects/Language/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Language/build.xml b/frameworks/projects/Language/build.xml
index b0449c1..e0c6ed2 100644
--- a/frameworks/projects/Language/build.xml
+++ b/frameworks/projects/Language/build.xml
@@ -40,7 +40,7 @@
         </ant>
     </target>
     
-    <target name="copy-swc">
+    <target name="copy-swc" if="env.AIR_HOME">
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
     </target>
     
@@ -74,7 +74,7 @@
         <ant dir="src/test/flex" target="clean"/>
     </target>
     
-    <target name="compile" description="Compiles .as files into .swc">
+    <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
@@ -83,8 +83,7 @@
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <jvmarg value="-Dflexlib=${FLEX_HOME}/frameworks" />
             <arg value="+flexlib=${FLEX_HOME}/frameworks" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
@@ -104,42 +103,28 @@
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
     </target>
     
-    <target name="check-falcon-home" unless="FALCON_HOME"
-        description="Check FALCON_HOME is a directory.">
+    <target name="check-falcon-home"
+        description="Set FALCON_HOME to point at the compiler.">
         
-        <echo message="FALCON_HOME is ${env.FALCON_HOME}"/>
-        
-        <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
+        <available file="${FLEXJS_HOME}/lib/falcon-mxmlc.jar"
         type="file"
         property="FALCON_HOME"
-        value="${env.FALCON_HOME}"/>
+        value="${FLEXJS_HOME}"/>
         
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
-        
-        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or the root of a FlexJS SDK"
         unless="FALCON_HOME"/>
     </target>
     
-    <target name="check-falconjx-home" unless="FALCONJX_HOME"
-        description="Check FALCON_HOME is a directory.">
-        
-        <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
+    <target name="check-falconjx-home"
+        description="Set FALCONJX_HOME to point at the cross-compiler.">
         
-        <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
+        <available file="${FLEXJS_HOME}/js/lib/jsc.jar"
         type="file"
         property="FALCONJX_HOME"
-        value="${env.FALCONJX_HOME}"/>
-        
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar"
-        type="file"
-        property="FALCONJX_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/>
+        value="${FLEXJS_HOME}/js"/>
         
         <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK"
         unless="FALCONJX_HOME"/>
     </target>
-
+    
 </project>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4184c40/frameworks/projects/MaterialDesignLite/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/build.xml b/frameworks/projects/MaterialDesignLite/build.xml
index 7c3464f..0560863 100644
--- a/frameworks/projects/MaterialDesignLite/build.xml
+++ b/frameworks/projects/MaterialDesignLite/build.xml
@@ -40,7 +40,7 @@
         </ant>
     </target>
         
-    <target name="copy-swc">
+    <target name="copy-swc" if="env.AIR_HOME">
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
     </target>
     
@@ -74,7 +74,7 @@
         <ant dir="src/test/flex" target="clean"/>
     </target>
     
-    <target name="compile" description="Compiles .as files into .swc">
+    <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
@@ -83,8 +83,7 @@
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <jvmarg value="-Dflexlib=${FLEX_HOME}/frameworks" />
             <arg value="+flexlib=${FLEX_HOME}/frameworks" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
@@ -104,39 +103,25 @@
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
     </target>
     
-    <target name="check-falcon-home" unless="FALCON_HOME"
-        description="Check FALCON_HOME is a directory.">
+    <target name="check-falcon-home"
+        description="Set FALCON_HOME to point at the compiler.">
         
-        <echo message="FALCON_HOME is ${env.FALCON_HOME}"/>
-        
-        <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${env.FALCON_HOME}"/>
-        
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
+        <available file="${FLEXJS_HOME}/lib/falcon-mxmlc.jar"
         type="file"
         property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
+        value="${FLEXJS_HOME}"/>
         
-        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or the root of a FlexJS SDK"
         unless="FALCON_HOME"/>
     </target>
     
-    <target name="check-falconjx-home" unless="FALCONJX_HOME"
-        description="Check FALCON_HOME is a directory.">
-        
-        <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
-        
-        <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
-        type="file"
-        property="FALCONJX_HOME"
-        value="${env.FALCONJX_HOME}"/>
+    <target name="check-falconjx-home"
+        description="Set FALCONJX_HOME to point at the cross-compiler.">
         
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar"
+        <available file="${FLEXJS_HOME}/js/lib/jsc.jar"
         type="file"
         property="FALCONJX_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/>
+        value="${FLEXJS_HOME}/js"/>
         
         <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK"
         unless="FALCONJX_HOME"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4184c40/frameworks/projects/Mobile/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/build.xml b/frameworks/projects/Mobile/build.xml
index c53bd7a..3bb45d6 100644
--- a/frameworks/projects/Mobile/build.xml
+++ b/frameworks/projects/Mobile/build.xml
@@ -42,7 +42,7 @@
         </ant>
     </target>
         
-    <target name="copy-swc">
+    <target name="copy-swc" if="env.AIR_HOME">
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
     </target>
     
@@ -76,7 +76,7 @@
         <ant dir="src/test/flex" target="clean"/>
     </target>
     
-    <target name="compile" description="Compiles .as files into .swc">
+    <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
@@ -85,8 +85,7 @@
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <jvmarg value="-Dflexlib=${FLEX_HOME}/frameworks" />
             <arg value="+flexlib=${FLEX_HOME}/frameworks" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
@@ -106,39 +105,25 @@
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
     </target>
     
-    <target name="check-falcon-home" unless="FALCON_HOME"
-        description="Check FALCON_HOME is a directory.">
+    <target name="check-falcon-home"
+        description="Set FALCON_HOME to point at the compiler.">
         
-        <echo message="FALCON_HOME is ${env.FALCON_HOME}"/>
-        
-        <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${env.FALCON_HOME}"/>
-        
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
+        <available file="${FLEXJS_HOME}/lib/falcon-mxmlc.jar"
         type="file"
         property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler"/>
+        value="${FLEXJS_HOME}"/>
         
-        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or a FlexJS SDK folder"
+        <fail message="FALCON_HOME must be set to a folder with a lib sub-folder containing falcon-mxmlc.jar such as the compiler folder in flex-falcon repo or the root of a FlexJS SDK"
         unless="FALCON_HOME"/>
     </target>
     
-    <target name="check-falconjx-home" unless="FALCONJX_HOME"
-        description="Check FALCON_HOME is a directory.">
-        
-        <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/>
-        
-        <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
-        type="file"
-        property="FALCONJX_HOME"
-        value="${env.FALCONJX_HOME}"/>
+    <target name="check-falconjx-home"
+        description="Set FALCONJX_HOME to point at the cross-compiler.">
         
-        <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar"
+        <available file="${FLEXJS_HOME}/js/lib/jsc.jar"
         type="file"
         property="FALCONJX_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/>
+        value="${FLEXJS_HOME}/js"/>
         
         <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK"
         unless="FALCONJX_HOME"/>


Mime
View raw message