flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [4/6] git commit: [flex-asjs] [refs/heads/core_js_to_as] - clean up warnings
Date Thu, 17 Dec 2015 06:33:22 GMT
clean up warnings


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

Branch: refs/heads/core_js_to_as
Commit: a94bf841edc283505e320067e72b60b42aee8c6c
Parents: 9180820
Author: Alex Harui <aharui@apache.org>
Authored: Wed Dec 16 15:39:51 2015 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Wed Dec 16 15:39:51 2015 -0800

----------------------------------------------------------------------
 examples/build_example.xml                      | 54 +++++++++++++++
 examples/flexjs/ChartExample/build.xml          | 31 +--------
 examples/flexjs/CordovaCameraExample/build.xml  | 29 --------
 examples/flexjs/DataBindingExample/build.xml    | 29 --------
 .../flexjs/DataBindingExample_Flat/build.xml    | 29 --------
 examples/flexjs/DataBindingExample_as/build.xml | 29 --------
 examples/flexjs/DataGridExample/build.xml       | 33 +--------
 examples/flexjs/DesktopMap/build.xml            | 35 +---------
 examples/flexjs/FlexJSStore/build.xml           | 29 --------
 examples/flexjs/FlexJSStore_jquery/build.xml    | 31 +--------
 .../flexjs/FlexWebsiteStatsViewer/build.xml     | 29 --------
 examples/flexjs/MapSearch/build.xml             | 35 +---------
 examples/flexjs/MobileTrader/build.xml          | 33 +--------
 examples/flexjs/TodoListSampleApp/build.xml     | 29 --------
 examples/native/ButtonExample/build.xml         | 69 ++++++++----------
 examples/native/USStatesMap/build.xml           | 73 ++++++++------------
 16 files changed, 121 insertions(+), 476 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/build_example.xml
----------------------------------------------------------------------
diff --git a/examples/build_example.xml b/examples/build_example.xml
index 0dae399..9a78647 100644
--- a/examples/build_example.xml
+++ b/examples/build_example.xml
@@ -20,6 +20,60 @@
 
 <project name="build_example" basedir=".">
 
+    <condition property="FALCON_HOME" value="${env.FALCON_HOME}">
+        <and>
+            <not>
+                <isset property="FALCON_HOME" />
+            </not>
+            <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar" type="file" />
+        </and>
+    </condition>
+
+    <condition property="FALCON_HOME" value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk">
+        <and>
+            <not>
+                <isset property="FALCON_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar"
type="file" />
+        </and>
+    </condition>
+
+    <condition property="FALCONJX_HOME" value="${env.FALCONJX_HOME}">
+        <and>
+            <not>
+                <isset property="FALCONJX_HOME" />
+            </not>
+            <available file="${env.FALCONJX_HOME}/lib/jsc.jar" type="file" />
+        </and>
+    </condition>
+
+    <condition property="FALCONJX_HOME" value="${FLEXJS_HOME}/../flex-falcon/compiler.jx">
+        <and>
+            <not>
+                <isset property="FALCONJX_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar" type="file"
/>
+        </and>
+    </condition>
+
+    <condition property="GOOG_HOME" value="${env.GOOG_HOME}">
+        <and>
+            <not>
+                <isset property="GOOG_HOME" />
+            </not>
+            <available file="${env.GOOG_HOME}/closure/goog/base.js" type="file" />
+        </and>
+    </condition>
+
+    <condition property="GOOG_HOME" value="${FLEXJS_HOME}/js/lib/google/closure-library">
+        <and>
+            <not>
+                <isset property="GOOG_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
type="file" />
+        </and>
+    </condition>
+
     <path id="lib.path">
       <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
     </path>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/ChartExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/ChartExample/build.xml b/examples/flexjs/ChartExample/build.xml
index e193711..3eaa208 100644
--- a/examples/flexjs/ChartExample/build.xml
+++ b/examples/flexjs/ChartExample/build.xml
@@ -27,40 +27,11 @@
     <property environment="env"/>
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${FLEXJS_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/generated/dist/sdk/lib/falcon-mxmlc.jar"
-    type="file"
-    property="FALCON_HOME"
-    value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-    
-    <available file="${env.FALCONJX_HOME}/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"/>
-    
-    <available file="${env.GOOG_HOME}/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${env.GOOG_HOME}"/>
-    
-    <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
+    <include file="${basedir}/../../build_example.xml" />
     
     <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/js/out/bin/js.swc"/>
     
-    <include file="${basedir}/../../build_example.xml" />
-    
 <!-- temp remove build_example.compilejs -->
     <target name="main" depends="clean,build_example.compile,build_example.compilejs"
description="Clean build of ${example}">
     </target>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/CordovaCameraExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/CordovaCameraExample/build.xml b/examples/flexjs/CordovaCameraExample/build.xml
index 7aa14f4..9087907 100644
--- a/examples/flexjs/CordovaCameraExample/build.xml
+++ b/examples/flexjs/CordovaCameraExample/build.xml
@@ -31,35 +31,6 @@
     <property environment="env"/>
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${FLEXJS_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/generated/dist/sdk/lib/falcon-mxmlc.jar"
-    type="file"
-    property="FALCON_HOME"
-    value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-    
-    <available file="${env.FALCONJX_HOME}/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"/>
-    
-    <available file="${env.GOOG_HOME}/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${env.GOOG_HOME}"/>
-    
-    <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
     
     <property name="AIR_HOME" value="${env.AIR_HOME}"/>
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/DataBindingExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample/build.xml b/examples/flexjs/DataBindingExample/build.xml
index 88dbbba..9a08e7c 100644
--- a/examples/flexjs/DataBindingExample/build.xml
+++ b/examples/flexjs/DataBindingExample/build.xml
@@ -27,35 +27,6 @@
     <property environment="env"/>
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${FLEXJS_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/generated/dist/sdk/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-        
-    <available file="${env.FALCONJX_HOME}/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"/>
-        
-    <available file="${env.GOOG_HOME}/closure/goog/base.js"
-        type="file"
-        property="GOOG_HOME"
-        value="${env.GOOG_HOME}"/>
-        
-    <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
-        type="file"
-        property="GOOG_HOME"
-        value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
 
     <include file="${basedir}/../../build_example.xml" />
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/DataBindingExample_Flat/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample_Flat/build.xml b/examples/flexjs/DataBindingExample_Flat/build.xml
index 6553b2e..5ecc0dd 100644
--- a/examples/flexjs/DataBindingExample_Flat/build.xml
+++ b/examples/flexjs/DataBindingExample_Flat/build.xml
@@ -28,35 +28,6 @@
     <property environment="env"/>
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${FLEXJS_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/generated/dist/sdk/lib/falcon-mxmlc.jar"
-    type="file"
-    property="FALCON_HOME"
-    value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-    
-    <available file="${env.FALCONJX_HOME}/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"/>
-    
-    <available file="${env.GOOG_HOME}/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${env.GOOG_HOME}"/>
-    
-    <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
     
     <include file="${basedir}/../../build_example.xml" />
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/DataBindingExample_as/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample_as/build.xml b/examples/flexjs/DataBindingExample_as/build.xml
index db584dc..3aed7f8 100644
--- a/examples/flexjs/DataBindingExample_as/build.xml
+++ b/examples/flexjs/DataBindingExample_as/build.xml
@@ -27,35 +27,6 @@
     <property environment="env"/>
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${FLEXJS_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/generated/dist/sdk/lib/falcon-mxmlc.jar"
-    type="file"
-    property="FALCON_HOME"
-    value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-    
-    <available file="${env.FALCONJX_HOME}/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"/>
-    
-    <available file="${env.GOOG_HOME}/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${env.GOOG_HOME}"/>
-    
-    <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
     
     <include file="${basedir}/../../build_example.xml" />
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/DataGridExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataGridExample/build.xml b/examples/flexjs/DataGridExample/build.xml
index 61ebd4a..34c9abf 100644
--- a/examples/flexjs/DataGridExample/build.xml
+++ b/examples/flexjs/DataGridExample/build.xml
@@ -27,40 +27,11 @@
     <property environment="env"/>
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${FLEXJS_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/generated/dist/sdk/lib/falcon-mxmlc.jar"
-    type="file"
-    property="FALCON_HOME"
-    value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-    
-    <available file="${env.FALCONJX_HOME}/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"/>
-    
-    <available file="${env.GOOG_HOME}/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${env.GOOG_HOME}"/>
-    
-    <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
-        
-    <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/js/out/bin/js.swc"/>
     
     <include file="${basedir}/../../build_example.xml" />
 
+    <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/js/out/bin/js.swc"/>
+
     <target name="main" depends="clean,build_example.compile,build_example.compilejs"
description="Clean build of ${example}">
     </target>
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/DesktopMap/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DesktopMap/build.xml b/examples/flexjs/DesktopMap/build.xml
index d77d87d..3b6daa0 100644
--- a/examples/flexjs/DesktopMap/build.xml
+++ b/examples/flexjs/DesktopMap/build.xml
@@ -31,41 +31,8 @@
     <property environment="env"/>
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${FLEXJS_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/generated/dist/sdk/lib/falcon-mxmlc.jar"
-    type="file"
-    property="FALCON_HOME"
-    value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-    
-    <available file="${env.FALCONJX_HOME}/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"/>
-    
-    <available file="${env.GOOG_HOME}/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${env.GOOG_HOME}"/>
-    
-    <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
-    
     <property name="AIR_HOME" value="${env.AIR_HOME}"/>
     
-    <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/google_maps/out/bin/google_maps.swc"/>
-    
-    
     <condition property="adl" value="adl.exe">
         <os family="windows"/>
     </condition>
@@ -84,6 +51,8 @@
 
     <include file="${basedir}/../../build_example.xml" />
 
+    <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/google_maps/out/bin/google_maps.swc"/>
+
     <target name="main" depends="clean,build_example.compilejsair" description="Clean
build of ${example}">
     </target>
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/FlexJSStore/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/build.xml b/examples/flexjs/FlexJSStore/build.xml
index 7dc4d66..82d62d3 100644
--- a/examples/flexjs/FlexJSStore/build.xml
+++ b/examples/flexjs/FlexJSStore/build.xml
@@ -27,35 +27,6 @@
     <property environment="env"/>
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${FLEXJS_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/generated/dist/sdk/lib/falcon-mxmlc.jar"
-    type="file"
-    property="FALCON_HOME"
-    value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-    
-    <available file="${env.FALCONJX_HOME}/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"/>
-    
-    <available file="${env.GOOG_HOME}/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${env.GOOG_HOME}"/>
-    
-    <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
     
     <include file="${basedir}/../../build_example.xml" />
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/FlexJSStore_jquery/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/build.xml b/examples/flexjs/FlexJSStore_jquery/build.xml
index 4412a04..d78adbd 100644
--- a/examples/flexjs/FlexJSStore_jquery/build.xml
+++ b/examples/flexjs/FlexJSStore_jquery/build.xml
@@ -27,40 +27,11 @@
     <property environment="env"/>
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${FLEXJS_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/generated/dist/sdk/lib/falcon-mxmlc.jar"
-    type="file"
-    property="FALCON_HOME"
-    value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-    
-    <available file="${env.FALCONJX_HOME}/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"/>
-    
-    <available file="${env.GOOG_HOME}/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${env.GOOG_HOME}"/>
-    
-    <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
+    <include file="${basedir}/../../build_example.xml" />
     
     <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/jquery/out/bin/jquery-1.9.swc"/>
     
-    <include file="${basedir}/../../build_example.xml" />
-    
     <target name="main" depends="clean,build_example.compile,build_example.compilejs"
description="Clean build of ${example}">
         <mkdir dir="${basedir}/bin-debug/data" />
         <copy file="${basedir}/src/data/catalog.json" tofile="${basedir}/bin-debug/data/catalog.json"
/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/FlexWebsiteStatsViewer/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexWebsiteStatsViewer/build.xml b/examples/flexjs/FlexWebsiteStatsViewer/build.xml
index 20b4415..c8479ae 100644
--- a/examples/flexjs/FlexWebsiteStatsViewer/build.xml
+++ b/examples/flexjs/FlexWebsiteStatsViewer/build.xml
@@ -27,35 +27,6 @@
     <property environment="env"/>
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${FLEXJS_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/generated/dist/sdk/lib/falcon-mxmlc.jar"
-    type="file"
-    property="FALCON_HOME"
-    value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-    
-    <available file="${env.FALCONJX_HOME}/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"/>
-    
-    <available file="${env.GOOG_HOME}/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${env.GOOG_HOME}"/>
-    
-    <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
     
     <include file="${basedir}/../../build_example.xml" />
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/MapSearch/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MapSearch/build.xml b/examples/flexjs/MapSearch/build.xml
index 77f0596..c661f54 100644
--- a/examples/flexjs/MapSearch/build.xml
+++ b/examples/flexjs/MapSearch/build.xml
@@ -30,41 +30,9 @@
     <property environment="env"/>
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${FLEXJS_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/generated/dist/sdk/lib/falcon-mxmlc.jar"
-    type="file"
-    property="FALCON_HOME"
-    value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-    
-    <available file="${env.FALCONJX_HOME}/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"/>
-    
-    <available file="${env.GOOG_HOME}/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${env.GOOG_HOME}"/>
-    
-    <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
     
     <property name="AIR_HOME" value="${env.AIR_HOME}"/>
     
-    <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/google_maps/out/bin/google_maps.swc"/>
-    
-    
     <condition property="adl" value="adl.exe">
         <os family="windows"/>
     </condition>
@@ -83,6 +51,9 @@
 
     <include file="${basedir}/../../build_example.xml" />
 
+    <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/google_maps/out/bin/google_maps.swc"/>
+
+
     <target name="main" depends="clean,build_example.compilejsair" description="Clean
build of ${example}">
     </target>
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/MobileTrader/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/build.xml b/examples/flexjs/MobileTrader/build.xml
index cfadc95..8384d48 100644
--- a/examples/flexjs/MobileTrader/build.xml
+++ b/examples/flexjs/MobileTrader/build.xml
@@ -26,40 +26,11 @@
     <property environment="env"/>
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${FLEXJS_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/generated/dist/sdk/lib/falcon-mxmlc.jar"
-    type="file"
-    property="FALCON_HOME"
-    value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-    
-    <available file="${env.FALCONJX_HOME}/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"/>
-    
-    <available file="${env.GOOG_HOME}/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${env.GOOG_HOME}"/>
-    
-    <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
-    
-    <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/js/out/bin/js.swc"/>
     
     <include file="${basedir}/../../build_example.xml" />
 
+    <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/js/out/bin/js.swc"/>
+
     <target name="main" depends="clean,build_example.compile,build_example.compilejs"
description="Clean build of ${example}">
     </target>
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/TodoListSampleApp/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/TodoListSampleApp/build.xml b/examples/flexjs/TodoListSampleApp/build.xml
index db82c4c..3fc578b 100644
--- a/examples/flexjs/TodoListSampleApp/build.xml
+++ b/examples/flexjs/TodoListSampleApp/build.xml
@@ -25,35 +25,6 @@
     <property environment="env"/>
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${FLEXJS_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/generated/dist/sdk/lib/falcon-mxmlc.jar"
-    type="file"
-    property="FALCON_HOME"
-    value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-    
-    <available file="${env.FALCONJX_HOME}/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"/>
-    
-    <available file="${env.GOOG_HOME}/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${env.GOOG_HOME}"/>
-    
-    <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
-    type="file"
-    property="GOOG_HOME"
-    value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
     
     <include file="${basedir}/../../build_example.xml" />
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/native/ButtonExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/native/ButtonExample/build.xml b/examples/native/ButtonExample/build.xml
index 2d99e0f..9215c58 100644
--- a/examples/native/ButtonExample/build.xml
+++ b/examples/native/ButtonExample/build.xml
@@ -27,50 +27,35 @@
     <property environment="env"/>
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${FLEXJS_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/generated/dist/sdk/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-        
-    <available file="${env.FALCONJX_HOME}/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"/>
-        
-    <available file="${env.GOOG_HOME}/closure/goog/base.js"
-        type="file"
-        property="GOOG_HOME"
-        value="${env.GOOG_HOME}"/>
-        
-    <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
-        type="file"
-        property="GOOG_HOME"
-        value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
 
-    <available file="${FLEXJS_HOME}/js/libs/js.swc"
-        type="file"
-        property="JS.SWC"
-        value="${FLEXJS_HOME}/js/libs/js.swc" />
-        
-    <available file="${FALCONJX_HOME}/../externs/js/out/bin/js.swc"
-        type="file"
-        property="JS.SWC"
-        value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
+    <include file="${basedir}/../../build_example.xml" />
+
+    <condition property="JS.SWC" value="${FLEXJS_HOME}/js/libs/js.swc" >
+        <and>
+            <not>
+                <isset property="JS.SWC" />
+            </not>
+            <available file="${FLEXJS_HOME}/js/libs/js.swc" type="file" />
+        </and>
+    </condition>
+
+    <condition property="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc"
>
+        <and>
+            <not>
+                <isset property="JS.SWC" />
+            </not>
+            <available file="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" type="file"
/>
+        </and>
+    </condition>
         
-    <available file="${FALCONJX_HOME}/libs/js.swc"
-        type="file"
-        property="JS.SWC"
-        value="${FALCONJX_HOME}/libs/js.swc" />
+    <condition property="JS.SWC" value="${FALCONJX_HOME}/libs/js.swc" >
+        <and>
+            <not>
+                <isset property="JS.SWC" />
+            </not>
+            <available file="${FALCONJX_HOME}/libs/js.swc" type="file" />
+        </and>
+    </condition>
         
     <path id="lib.path">
         <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/native/USStatesMap/build.xml
----------------------------------------------------------------------
diff --git a/examples/native/USStatesMap/build.xml b/examples/native/USStatesMap/build.xml
index e2724f5..7dbabc4 100644
--- a/examples/native/USStatesMap/build.xml
+++ b/examples/native/USStatesMap/build.xml
@@ -27,51 +27,36 @@
     <property environment="env"/>
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${FLEXJS_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/generated/dist/sdk/lib/falcon-mxmlc.jar"
-        type="file"
-        property="FALCON_HOME"
-        value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-        
-    <available file="${env.FALCONJX_HOME}/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"/>
-        
-    <available file="${env.GOOG_HOME}/closure/goog/base.js"
-        type="file"
-        property="GOOG_HOME"
-        value="${env.GOOG_HOME}"/>
-        
-    <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
-        type="file"
-        property="GOOG_HOME"
-        value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
 
-    <available file="${FLEXJS_HOME}/js/libs/js.swc"
-        type="file"
-        property="JS.SWC"
-        value="${FLEXJS_HOME}/js/libs/js.swc" />
-        
-    <available file="${FALCONJX_HOME}/../externs/js/out/bin/js.swc"
-        type="file"
-        property="JS.SWC"
-        value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
-        
-    <available file="${FALCONJX_HOME}/libs/js.swc"
-        type="file"
-        property="JS.SWC"
-        value="${FALCONJX_HOME}/libs/js.swc" />
-        
+    <include file="${basedir}/../../build_example.xml" />
+
+    <condition property="JS.SWC" value="${FLEXJS_HOME}/js/libs/js.swc" >
+        <and>
+            <not>
+                <isset property="JS.SWC" />
+            </not>
+            <available file="${FLEXJS_HOME}/js/libs/js.swc" type="file" />
+        </and>
+    </condition>
+
+    <condition property="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc"
>
+        <and>
+            <not>
+                <isset property="JS.SWC" />
+            </not>
+            <available file="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" type="file"
/>
+        </and>
+    </condition>
+
+    <condition property="JS.SWC" value="${FALCONJX_HOME}/libs/js.swc" >
+        <and>
+            <not>
+                <isset property="JS.SWC" />
+            </not>
+            <available file="${FALCONJX_HOME}/libs/js.swc" type="file" />
+        </and>
+    </condition>
+
     <path id="lib.path">
         <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
     </path>


Mime
View raw message