You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2016/03/24 01:34:09 UTC
git commit: [flex-asjs] [refs/heads/develop] - fix up ant scripts to
hanlde both repo folder structure and binary package folder structure
Repository: flex-asjs
Updated Branches:
refs/heads/develop d3f59fa55 -> a97af6eb2
fix up ant scripts to hanlde both repo folder structure and binary package folder structure
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a97af6eb
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a97af6eb
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a97af6eb
Branch: refs/heads/develop
Commit: a97af6eb23f73609601ab8b8227a15e3ab64f4a1
Parents: d3f59fa
Author: Alex Harui <ah...@apache.org>
Authored: Wed Mar 23 17:33:49 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Mar 23 17:34:01 2016 -0700
----------------------------------------------------------------------
examples/flexjs/ChartExample/build.xml | 16 ++++++++++++++++
examples/flexjs/DataGridExample/build.xml | 16 ++++++++++++++++
examples/flexjs/FlexJSStore_jquery/build.xml | 16 ++++++++++++++++
examples/flexjs/MapSearch/build.xml | 16 ++++++++++++++++
examples/flexjs/MobileTrader/build.xml | 16 ++++++++++++++++
examples/flexjs/StorageExample/build.xml | 16 ++++++++++++++++
examples/flexjs/TreeExample/build.xml | 16 ++++++++++++++++
frameworks/projects/Binding/build.xml | 7 +++++++
frameworks/projects/Charts/build.xml | 7 +++++++
frameworks/projects/Collections/build.xml | 7 +++++++
frameworks/projects/Core/build.xml | 7 +++++++
frameworks/projects/CreateJS/build.xml | 11 ++++++++++-
frameworks/projects/DragDrop/build.xml | 7 +++++++
frameworks/projects/Effects/build.xml | 7 +++++++
frameworks/projects/Flat/build.xml | 7 +++++++
frameworks/projects/Formatters/build.xml | 6 ++++++
frameworks/projects/GoogleMaps/build.xml | 11 ++++++++++-
frameworks/projects/Graphics/build.xml | 6 ++++++
frameworks/projects/HTML/build.xml | 6 ++++++
frameworks/projects/HTML5/build.xml | 6 ++++++
frameworks/projects/JQuery/build.xml | 11 ++++++++++-
frameworks/projects/Mobile/build.xml | 6 ++++++
frameworks/projects/Network/build.xml | 6 ++++++
frameworks/projects/Reflection/build.xml | 6 ++++++
frameworks/projects/Storage/build.xml | 9 +++++++++
25 files changed, 242 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/examples/flexjs/ChartExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/ChartExample/build.xml b/examples/flexjs/ChartExample/build.xml
index 3eaa208..dc88d34 100644
--- a/examples/flexjs/ChartExample/build.xml
+++ b/examples/flexjs/ChartExample/build.xml
@@ -30,6 +30,22 @@
<include file="${basedir}/../../build_example.xml" />
+ <condition property="extlib_arg" value="-external-library-path=${FLEXJS_HOME}/js/libs/js.swc" >
+ <and>
+ <not>
+ <isset property="extlib_arg" />
+ </not>
+ <available file="${FLEXJS_HOME}/js/libs/js.swc" type="file" />
+ </and>
+ </condition>
+ <condition property="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../js/libs/js.swc" >
+ <and>
+ <not>
+ <isset property="extlib_arg" />
+ </not>
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" type="file" />
+ </and>
+ </condition>
<property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/js/out/bin/js.swc"/>
<!-- temp remove build_example.compilejs -->
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/examples/flexjs/DataGridExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataGridExample/build.xml b/examples/flexjs/DataGridExample/build.xml
index 34c9abf..bb8bfca 100644
--- a/examples/flexjs/DataGridExample/build.xml
+++ b/examples/flexjs/DataGridExample/build.xml
@@ -30,6 +30,22 @@
<include file="${basedir}/../../build_example.xml" />
+ <condition property="extlib_arg" value="-external-library-path=${FLEXJS_HOME}/js/libs/js.swc" >
+ <and>
+ <not>
+ <isset property="extlib_arg" />
+ </not>
+ <available file="${FLEXJS_HOME}/js/libs/js.swc" type="file" />
+ </and>
+ </condition>
+ <condition property="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../js/libs/js.swc" >
+ <and>
+ <not>
+ <isset property="extlib_arg" />
+ </not>
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" type="file" />
+ </and>
+ </condition>
<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}">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/examples/flexjs/FlexJSStore_jquery/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/build.xml b/examples/flexjs/FlexJSStore_jquery/build.xml
index 53f5caf..4bd6297 100644
--- a/examples/flexjs/FlexJSStore_jquery/build.xml
+++ b/examples/flexjs/FlexJSStore_jquery/build.xml
@@ -30,6 +30,22 @@
<include file="${basedir}/../../build_example.xml" />
+ <condition property="extlib_arg" value="-external-library-path=${FLEXJS_HOME}/js/libs/jquery.swc" >
+ <and>
+ <not>
+ <isset property="extlib_arg" />
+ </not>
+ <available file="${FLEXJS_HOME}/js/libs/jquery.swc" type="file" />
+ </and>
+ </condition>
+ <condition property="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../js/libs/jquery.swc" >
+ <and>
+ <not>
+ <isset property="extlib_arg" />
+ </not>
+ <available file="${FALCONJX_HOME}/../js/libs/jquery.swc" type="file" />
+ </and>
+ </condition>
<property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/jquery/out/bin/jquery-1.9.swc"/>
<property name="opt1_arg" value="-js-output-optimization=skipFunctionCoercions" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/examples/flexjs/MapSearch/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MapSearch/build.xml b/examples/flexjs/MapSearch/build.xml
index c35e408..b6be693 100644
--- a/examples/flexjs/MapSearch/build.xml
+++ b/examples/flexjs/MapSearch/build.xml
@@ -51,6 +51,22 @@
<include file="${basedir}/../../build_example.xml" />
+ <condition property="extlib_arg" value="-external-library-path=${FLEXJS_HOME}/js/libs/google_maps.swc" >
+ <and>
+ <not>
+ <isset property="extlib_arg" />
+ </not>
+ <available file="${FLEXJS_HOME}/js/libs/google_maps.swc" type="file" />
+ </and>
+ </condition>
+ <condition property="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../js/libs/google_maps.swc" >
+ <and>
+ <not>
+ <isset property="extlib_arg" />
+ </not>
+ <available file="${FALCONJX_HOME}/../js/libs/google_maps.swc" type="file" />
+ </and>
+ </condition>
<property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/google_maps/out/bin/google_maps.swc"/>
<property name="opt1_arg" value="-remove-circulars" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/examples/flexjs/MobileTrader/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/build.xml b/examples/flexjs/MobileTrader/build.xml
index e1b9c97..9c9b677 100644
--- a/examples/flexjs/MobileTrader/build.xml
+++ b/examples/flexjs/MobileTrader/build.xml
@@ -30,6 +30,22 @@
<include file="${basedir}/../../build_example.xml" />
+ <condition property="extlib_arg" value="-external-library-path=${FLEXJS_HOME}/js/libs/js.swc" >
+ <and>
+ <not>
+ <isset property="extlib_arg" />
+ </not>
+ <available file="${FLEXJS_HOME}/js/libs/js.swc" type="file" />
+ </and>
+ </condition>
+ <condition property="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../js/libs/js.swc" >
+ <and>
+ <not>
+ <isset property="extlib_arg" />
+ </not>
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" type="file" />
+ </and>
+ </condition>
<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}">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/examples/flexjs/StorageExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/StorageExample/build.xml b/examples/flexjs/StorageExample/build.xml
index a976cad..dcb2948 100644
--- a/examples/flexjs/StorageExample/build.xml
+++ b/examples/flexjs/StorageExample/build.xml
@@ -51,6 +51,22 @@
<include file="${basedir}/../../build_example.xml" />
+ <condition property="extlib_arg" value="-external-library-path=${FLEXJS_HOME}/js/libs/cordova.swc" >
+ <and>
+ <not>
+ <isset property="extlib_arg" />
+ </not>
+ <available file="${FLEXJS_HOME}/js/libs/cordova.swc" type="file" />
+ </and>
+ </condition>
+ <condition property="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../js/libs/cordova.swc" >
+ <and>
+ <not>
+ <isset property="extlib_arg" />
+ </not>
+ <available file="${FALCONJX_HOME}/../js/libs/cordova.swc" type="file" />
+ </and>
+ </condition>
<property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/cordova/out/bin/cordova.swc"/>
<property name="opt1_arg" value="-remove-circulars" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/examples/flexjs/TreeExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/TreeExample/build.xml b/examples/flexjs/TreeExample/build.xml
index c2fcd0d..449e778 100644
--- a/examples/flexjs/TreeExample/build.xml
+++ b/examples/flexjs/TreeExample/build.xml
@@ -30,6 +30,22 @@
<include file="${basedir}/../../build_example.xml" />
+ <condition property="extlib_arg" value="-external-library-path=${FLEXJS_HOME}/js/libs/js.swc" >
+ <and>
+ <not>
+ <isset property="extlib_arg" />
+ </not>
+ <available file="${FLEXJS_HOME}/js/libs/js.swc" type="file" />
+ </and>
+ </condition>
+ <condition property="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../js/libs/js.swc" >
+ <and>
+ <not>
+ <isset property="extlib_arg" />
+ </not>
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" type="file" />
+ </and>
+ </condition>
<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}">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/frameworks/projects/Binding/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/build.xml b/frameworks/projects/Binding/build.xml
index 06c7c40..29ffbe4 100644
--- a/frameworks/projects/Binding/build.xml
+++ b/frameworks/projects/Binding/build.xml
@@ -28,8 +28,15 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
+ </condition>
<property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
+ <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
+ </condition>
<property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" />
+
<property name="target.name" value="Binding-${release.version}.swc" />
<property name="target.name.no.version" value="Binding.swc" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/frameworks/projects/Charts/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/build.xml b/frameworks/projects/Charts/build.xml
index ce3de72..268eaab 100644
--- a/frameworks/projects/Charts/build.xml
+++ b/frameworks/projects/Charts/build.xml
@@ -28,8 +28,15 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
+ </condition>
<property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
+ <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
+ </condition>
<property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" />
+
<property name="target.name" value="Charts-${release.version}.swc" />
<property name="target.name.no.version" value="Charts.swc" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/frameworks/projects/Collections/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/build.xml b/frameworks/projects/Collections/build.xml
index b94ec18..90e8757 100644
--- a/frameworks/projects/Collections/build.xml
+++ b/frameworks/projects/Collections/build.xml
@@ -28,8 +28,15 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
+ </condition>
<property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
+ <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
+ </condition>
<property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" />
+
<property name="target.name" value="Collections-${release.version}.swc" />
<property name="target.name.no.version" value="Collections.swc" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/frameworks/projects/Core/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/build.xml b/frameworks/projects/Core/build.xml
index 009ab52..2d1b251 100644
--- a/frameworks/projects/Core/build.xml
+++ b/frameworks/projects/Core/build.xml
@@ -28,8 +28,15 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
+ </condition>
<property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
+ <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
+ </condition>
<property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" />
+
<property name="target.name" value="Core-${release.version}.swc" />
<property name="target.name.no.version" value="Core.swc" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/frameworks/projects/CreateJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/build.xml b/frameworks/projects/CreateJS/build.xml
index 2d0018e..caed5c7 100644
--- a/frameworks/projects/CreateJS/build.xml
+++ b/frameworks/projects/CreateJS/build.xml
@@ -28,9 +28,18 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
+ </condition>
<property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
- <property name="CREATEJS.SWC" value="${FALCONJX_HOME}/../externs/createjs/out/bin/createjs.swc" />
+ <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
+ </condition>
<property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" />
+ <condition property="CREATEJS.SWC" value="${FALCONJX_HOME}/../js/libs/createjs.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/createjs.swc" />
+ </condition>
+ <property name="CREATEJS.SWC" value="${FALCONJX_HOME}/../externs/createjs/out/bin/createjs.swc" />
<condition property="no.lint" value="true">
<os family="windows"/>
</condition>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/frameworks/projects/DragDrop/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/build.xml b/frameworks/projects/DragDrop/build.xml
index 930716f..ef605af 100644
--- a/frameworks/projects/DragDrop/build.xml
+++ b/frameworks/projects/DragDrop/build.xml
@@ -28,8 +28,15 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
+ </condition>
<property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
+ <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
+ </condition>
<property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" />
+
<property name="target.name" value="DragDrop-${release.version}.swc" />
<property name="target.name.no.version" value="DragDrop.swc" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/frameworks/projects/Effects/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/build.xml b/frameworks/projects/Effects/build.xml
index 84062df..a469f5e 100644
--- a/frameworks/projects/Effects/build.xml
+++ b/frameworks/projects/Effects/build.xml
@@ -28,8 +28,15 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
+ </condition>
<property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
+ <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
+ </condition>
<property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" />
+
<property name="target.name" value="Effects-${release.version}.swc" />
<property name="target.name.no.version" value="Effects.swc" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/frameworks/projects/Flat/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/build.xml b/frameworks/projects/Flat/build.xml
index 858b6d2..9bc139f 100644
--- a/frameworks/projects/Flat/build.xml
+++ b/frameworks/projects/Flat/build.xml
@@ -28,8 +28,15 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
+ </condition>
<property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
+ <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
+ </condition>
<property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" />
+
<property name="target.name" value="Flat-${release.version}.swc" />
<property name="target.name.no.version" value="Flat.swc" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/frameworks/projects/Formatters/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Formatters/build.xml b/frameworks/projects/Formatters/build.xml
index 2048821..9f57088 100644
--- a/frameworks/projects/Formatters/build.xml
+++ b/frameworks/projects/Formatters/build.xml
@@ -28,7 +28,13 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
+ </condition>
<property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
+ <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
+ </condition>
<property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" />
<property name="target.name" value="Formatters-${release.version}.swc" />
<property name="target.name.no.version" value="Formatters.swc" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/frameworks/projects/GoogleMaps/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/build.xml b/frameworks/projects/GoogleMaps/build.xml
index f9e3654..2bdd19d 100644
--- a/frameworks/projects/GoogleMaps/build.xml
+++ b/frameworks/projects/GoogleMaps/build.xml
@@ -28,9 +28,18 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
+ </condition>
<property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
- <property name="GOOGLEMAPS.SWC" value="${FALCONJX_HOME}/../externs/google_maps/out/bin/google_maps.swc" />
+ <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
+ </condition>
<property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" />
+ <condition property="GOOGLEMAPS.SWC" value="${FALCONJX_HOME}/../js/libs/google_maps.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/google_maps.swc" />
+ </condition>
+ <property name="GOOGLEMAPS.SWC" value="${FALCONJX_HOME}/../externs/google_maps/out/bin/google_maps.swc" />
<property name="target.name" value="GoogleMaps-${release.version}.swc" />
<property name="target.name.no.version" value="GoogleMaps.swc" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/frameworks/projects/Graphics/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/build.xml b/frameworks/projects/Graphics/build.xml
index 25463f7..c05b49a 100644
--- a/frameworks/projects/Graphics/build.xml
+++ b/frameworks/projects/Graphics/build.xml
@@ -28,7 +28,13 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
+ </condition>
<property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
+ <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
+ </condition>
<property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" />
<property name="target.name" value="Graphics-${release.version}.swc" />
<property name="target.name.no.version" value="Graphics.swc" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/frameworks/projects/HTML/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/build.xml b/frameworks/projects/HTML/build.xml
index 3305178..a70c56f 100644
--- a/frameworks/projects/HTML/build.xml
+++ b/frameworks/projects/HTML/build.xml
@@ -28,7 +28,13 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
+ </condition>
<property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
+ <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
+ </condition>
<property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" />
<property name="target.name" value="HTML-${release.version}.swc" />
<property name="target.name.no.version" value="HTML.swc" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/frameworks/projects/HTML5/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML5/build.xml b/frameworks/projects/HTML5/build.xml
index 11d0829..a316de6 100644
--- a/frameworks/projects/HTML5/build.xml
+++ b/frameworks/projects/HTML5/build.xml
@@ -28,7 +28,13 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
+ </condition>
<property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
+ <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
+ </condition>
<property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" />
<property name="target.name" value="HTML5-${release.version}.swc" />
<property name="target.name.no.version" value="HTML5.swc" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/frameworks/projects/JQuery/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/JQuery/build.xml b/frameworks/projects/JQuery/build.xml
index ba3a857..754b23a 100644
--- a/frameworks/projects/JQuery/build.xml
+++ b/frameworks/projects/JQuery/build.xml
@@ -28,9 +28,18 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
+ </condition>
<property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
- <property name="JQUERY.SWC" value="${FALCONJX_HOME}/../externs/jquery/out/bin/jquery-1.9.swc" />
+ <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
+ </condition>
<property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" />
+ <condition property="JQUERY.SWC" value="${FALCONJX_HOME}/../js/libs/jquery.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/jquery.swc" />
+ </condition>
+ <property name="JQUERY.SWC" value="${FALCONJX_HOME}/../externs/jquery/out/bin/jquery-1.9.swc" />
<property name="target.name" value="JQuery-${release.version}.swc" />
<property name="target.name.no.version" value="JQuery.swc" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/frameworks/projects/Mobile/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/build.xml b/frameworks/projects/Mobile/build.xml
index 9666013..3def2bf 100644
--- a/frameworks/projects/Mobile/build.xml
+++ b/frameworks/projects/Mobile/build.xml
@@ -28,7 +28,13 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
+ </condition>
<property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
+ <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
+ </condition>
<property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" />
<property name="target.name" value="Mobile-${release.version}.swc" />
<property name="target.name.no.version" value="Mobile.swc" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/frameworks/projects/Network/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Network/build.xml b/frameworks/projects/Network/build.xml
index b7696a2..8a2e7fd 100644
--- a/frameworks/projects/Network/build.xml
+++ b/frameworks/projects/Network/build.xml
@@ -28,7 +28,13 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
+ </condition>
<property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
+ <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
+ </condition>
<property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" />
<property name="target.name" value="Network-${release.version}.swc" />
<property name="target.name.no.version" value="Network.swc" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/frameworks/projects/Reflection/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Reflection/build.xml b/frameworks/projects/Reflection/build.xml
index b15f68a..3b5038c 100644
--- a/frameworks/projects/Reflection/build.xml
+++ b/frameworks/projects/Reflection/build.xml
@@ -28,7 +28,13 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
+ </condition>
<property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
+ <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
+ </condition>
<property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" />
<property name="target.name" value="Reflection-${release.version}.swc" />
<property name="target.name.no.version" value="Reflection.swc" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a97af6eb/frameworks/projects/Storage/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Storage/build.xml b/frameworks/projects/Storage/build.xml
index 6fc0ed5..66508c1 100644
--- a/frameworks/projects/Storage/build.xml
+++ b/frameworks/projects/Storage/build.xml
@@ -28,8 +28,17 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/js.swc" />
+ </condition>
<property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
+ <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" />
+ </condition>
<property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" />
+ <condition property="CORDOVA.SWC" value="${FALCONJX_HOME}/../js/libs/cordova.swc" >
+ <available file="${FALCONJX_HOME}/../js/libs/cordova.swc" />
+ </condition>
<property name="CORDOVA.SWC" value="${FALCONJX_HOME}/../externs/cordova/out/bin/cordova.swc" />
<property name="target.name" value="Storage-${release.version}.swc" />
<property name="target.name.no.version" value="Storage.swc" />