flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [02/13] flex-typedefs git commit: fix up ant scripts
Date Wed, 07 Sep 2016 22:42:14 GMT
fix up ant scripts


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

Branch: refs/heads/master
Commit: aca1ec4acf431e37957fe9229d9bfeffe4ce6a31
Parents: f160f7c
Author: Alex Harui <aharui@apache.org>
Authored: Mon Jul 18 21:13:33 2016 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Jul 18 21:13:33 2016 -0700

----------------------------------------------------------------------
 GCL/build.xml                                | 58 ++++++++++++++++-
 cordova/build.xml                            | 60 ++++++++++++++++-
 createjs/build.xml                           | 70 ++++++++++++++++++--
 google_maps/build.xml                        | 75 ++++++++++++++++++++--
 google_maps/src/main/patch/google_maps.patch |  8 ++-
 jasmine/build.xml                            | 60 ++++++++++++++++-
 jquery/build.xml                             | 75 ++++++++++++++++++++--
 jquery/src/main/patch/jquery.patch           |  2 +
 js/build.xml                                 | 78 +++++++++++++++++++++--
 js/src/main/patch/js.patch                   |  2 +
 node/build.xml                               | 60 ++++++++++++++++-
 11 files changed, 512 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/aca1ec4a/GCL/build.xml
----------------------------------------------------------------------
diff --git a/GCL/build.xml b/GCL/build.xml
index 3167b90..08c2271 100644
--- a/GCL/build.xml
+++ b/GCL/build.xml
@@ -21,6 +21,62 @@
 
 <project name="GCL" default="main" basedir=".">
     
+    <property name="FLEXJS_HOME" value="${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/lib">
+        <and>
+            <not>
+                <isset property="FALCON_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
type="file" />
+        </and>
+    </condition>
+    
+    <condition property="FALCON_HOME" value="${FLEXJS_HOME}">
+        <and>
+            <not>
+                <isset property="FALCON_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/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}/js">
+        <and>
+            <not>
+                <isset property="FALCONJX_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/js/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>
+    
     <target name="main" depends="preprocess, externc, postprocess, compc" />
 
     <!-- we need to insert a line near the beginning of the file to make the
@@ -37,7 +93,7 @@
     <target name="compc" >
         <copy file="${basedir}/src/main/config/compile-as-config.xml"
         todir="${basedir}/target" />
-        <java jar="${basedir}/../../compiler/lib/falcon-compc.jar" fork="true"
+        <java jar="${FALCON_HOME}/falcon-compc.jar" fork="true"
             failonerror="true">
             <arg value="+flexlib=externs/frameworks" />
             <arg value="-debug" />

http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/aca1ec4a/cordova/build.xml
----------------------------------------------------------------------
diff --git a/cordova/build.xml b/cordova/build.xml
index 6eddf99..b5289bf 100644
--- a/cordova/build.xml
+++ b/cordova/build.xml
@@ -23,6 +23,62 @@
     
     <property name="cordova.version" value="4.11" />
     
+    <property name="FLEXJS_HOME" value="${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/lib">
+        <and>
+            <not>
+                <isset property="FALCON_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
type="file" />
+        </and>
+    </condition>
+    
+    <condition property="FALCON_HOME" value="${FLEXJS_HOME}">
+        <and>
+            <not>
+                <isset property="FALCON_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/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}/js">
+        <and>
+            <not>
+                <isset property="FALCONJX_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/js/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>
+    
     <target name="main" depends="preprocess, externc, postprocess, compc" />
 
     <!-- we need to insert a line near the beginning of the file to make the
@@ -31,7 +87,7 @@
     </target>
         
     <target name="externc" >
-        <java jar="${basedir}/../../compiler-jx/lib/externc.jar" fork="true"
+        <java jar="${FALCONJX_HOME}/lib/externc.jar" fork="true"
             failonerror="false">
             <arg value="+flexlib=externs" />
             <arg value="-debug" />
@@ -45,7 +101,7 @@
     <target name="compc" >
         <copy file="${basedir}/src/main/config/compile-as-config.xml"
         todir="${basedir}/target" />
-        <java jar="${basedir}/../../compiler/lib/falcon-compc.jar" fork="true"
+        <java jar="${FALCON_HOME}/falcon-compc.jar" fork="true"
             failonerror="true">
             <arg value="+flexlib=externs/frameworks" />
             <arg value="-debug" />

http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/aca1ec4a/createjs/build.xml
----------------------------------------------------------------------
diff --git a/createjs/build.xml b/createjs/build.xml
index ee108a2..50d7ad5 100644
--- a/createjs/build.xml
+++ b/createjs/build.xml
@@ -24,6 +24,62 @@
     <property name="createjs.version" value="0.8.0" />
     <property name="tweenjs.version" value="0.6.2" />
     
+    <property name="FLEXJS_HOME" value="${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/lib">
+        <and>
+            <not>
+                <isset property="FALCON_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
type="file" />
+        </and>
+    </condition>
+    
+    <condition property="FALCON_HOME" value="${FLEXJS_HOME}">
+        <and>
+            <not>
+                <isset property="FALCON_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/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}/js">
+        <and>
+            <not>
+                <isset property="FALCONJX_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/js/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>
+    
     <target name="main" depends="download, download_tween, preprocess, externc, postprocess,
compc" />
     
     <target name="download" >
@@ -260,9 +316,9 @@
             <arg value="${basedir}/target/downloads/TweenJS-${tweenjs.version}"/>
         </exec>
         <replace file="${basedir}/src/main/patch/easeljs.temp.patch" token="target/reference"
value="target/downloads" />
-        <replace file="${basedir}/src/main/patch/easeljs.temp.patch" token="${basedir}/target/downloads"
value="/externs/createjs/target/downloads" />
+        <replace file="${basedir}/src/main/patch/easeljs.temp.patch" token="${basedir}/target/downloads"
value="/createjs/target/downloads" />
         <replace file="${basedir}/src/main/patch/tweenjs.temp.patch" token="target/reference"
value="target/downloads" />
-        <replace file="${basedir}/src/main/patch/tweenjs.temp.patch" token="${basedir}/target/downloads"
value="/externs/createjs/target/downloads" />
+        <replace file="${basedir}/src/main/patch/tweenjs.temp.patch" token="${basedir}/target/downloads"
value="/createjs/target/downloads" />
         <concat destfile="${basedir}/src/main/patch/tweenjs.patch" >
             <header filtering="no" trimleading="yes">
                 Generated from Ant script
@@ -280,13 +336,13 @@
     </target>
     
     <target name="preprocess" depends="expandzip, expandzip_tween">
-        <exec executable="git" dir="${basedir}/../..">
+        <exec executable="git" dir="${basedir}/..">
             <arg value="apply"/>
             <arg value="--ignore-whitespace"/>
             <arg value="--whitespace=nowarn"/>
             <arg value="${basedir}/src/main/patch/easeljs.patch"/>
         </exec>
-        <exec executable="git" dir="${basedir}/../..">
+        <exec executable="git" dir="${basedir}/..">
             <arg value="apply"/>
             <arg value="--ignore-whitespace"/>
             <arg value="--whitespace=nowarn"/>
@@ -404,7 +460,7 @@
         <!-- this step removes function bodies and otherwise makes the files
              look like typical GCC externs files that GCC expects -->
         <delete dir="${basedir}/target/generated-sources/externs" />
-        <java jar="${basedir}/../../compiler-jx/lib/externc.jar" fork="true"
+        <java jar="${FALCONJX_HOME}/lib/externc.jar" fork="true"
             failonerror="false">
             <arg value="+flexlib=externs" />
             <arg value="-debug" />
@@ -484,7 +540,7 @@
     
     <target name="externc" >
         <delete dir="${basedir}/target/generated-sources/externs" />
-        <java jar="${basedir}/../../compiler-jx/lib/externc.jar" fork="true"
+        <java jar="${FALCONJX_HOME}/lib/externc.jar" fork="true"
             failonerror="false">
             <arg value="+flexlib=externs" />
             <arg value="-debug" />
@@ -498,7 +554,7 @@
     <target name="compc" >
         <copy file="${basedir}/src/main/config/compile-as-config.xml"
         todir="${basedir}/target" />
-        <java jar="${basedir}/../../compiler/lib/falcon-compc.jar" fork="true"
+        <java jar="${FALCON_HOME}/falcon-compc.jar" fork="true"
             failonerror="true">
             <arg value="+flexlib=externs/frameworks" />
             <arg value="-debug" />

http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/aca1ec4a/google_maps/build.xml
----------------------------------------------------------------------
diff --git a/google_maps/build.xml b/google_maps/build.xml
index a0c717f..2eb3e2d 100644
--- a/google_maps/build.xml
+++ b/google_maps/build.xml
@@ -23,10 +23,66 @@
     
     <property name="google_maps.version" value="3.11" />
     
+    <property name="FLEXJS_HOME" value="${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/lib">
+        <and>
+            <not>
+                <isset property="FALCON_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
type="file" />
+        </and>
+    </condition>
+    
+    <condition property="FALCON_HOME" value="${FLEXJS_HOME}">
+        <and>
+            <not>
+                <isset property="FALCON_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/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}/js">
+        <and>
+            <not>
+                <isset property="FALCONJX_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/js/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>
+    
     <target name="main" depends="preprocess, externc, postprocess, compc" />
     
     <target name="preprocess" depends="download">
-        <exec executable="git" dir="${basedir}/../..">
+        <exec executable="git" dir="${basedir}/..">
             <arg value="apply"/>
             <arg value="--ignore-whitespace"/>
             <arg value="--whitespace=nowarn"/>
@@ -68,19 +124,26 @@ google.maps = {};]]></replacevalue>
     <target name="diff" >
         <delete dir="${basedir}/src/main/patch" />
         <mkdir dir="${basedir}/src/main/patch" />
-        <exec executable="git" output="${basedir}/src/main/patch/google_maps.patch" >
+        <exec executable="git" output="${basedir}/src/main/patch/google_maps.temp.patch"
>
             <arg value="diff"/>
             <arg value="--no-index"/>
             <arg value="--"/>
             <arg value="${basedir}/target/reference"/>
             <arg value="${basedir}/target/downloads"/>
         </exec>
-        <replace file="${basedir}/src/main/patch/google_maps.patch" token="target/reference"
value="target/downloads" />
-        <replace file="${basedir}/src/main/patch/google_maps.patch" token="${basedir}/target/downloads"
value="/externs/google_maps/target/downloads" />
+        <replace file="${basedir}/src/main/patch/google_maps.temp.patch" token="target/reference"
value="target/downloads" />
+        <replace file="${basedir}/src/main/patch/google_maps.temp.patch" token="${basedir}/target/downloads"
value="/google_maps/target/downloads" />
+        <concat destfile="${basedir}/src/main/patch/google_maps.patch" >
+            <header filtering="no" trimleading="yes">
+                Generated from Ant script
+            </header>
+            <filelist dir="${basedir}/src/main/patch" files="google_maps.temp.patch"/>
+        </concat>
+        <delete file="${basedir}/src/main/patch/google_maps.temp.patch" />
     </target>
 
     <target name="externc" >
-        <java jar="${basedir}/../../compiler-jx/lib/externc.jar" fork="true"
+        <java jar="${FALCONJX_HOME}/lib/externc.jar" fork="true"
             failonerror="false">
             <arg value="+flexlib=externs" />
             <arg value="-debug" />
@@ -94,7 +157,7 @@ google.maps = {};]]></replacevalue>
     <target name="compc" >
         <copy file="${basedir}/src/main/config/compile-as-config.xml"
         todir="${basedir}/target" />
-        <java jar="${basedir}/../../compiler/lib/falcon-compc.jar" fork="true"
+        <java jar="${FALCON_HOME}/falcon-compc.jar" fork="true"
             failonerror="true">
             <arg value="+flexlib=externs/frameworks" />
             <arg value="-debug" />

http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/aca1ec4a/google_maps/src/main/patch/google_maps.patch
----------------------------------------------------------------------
diff --git a/google_maps/src/main/patch/google_maps.patch b/google_maps/src/main/patch/google_maps.patch
index 05064ab..8061e47 100644
--- a/google_maps/src/main/patch/google_maps.patch
+++ b/google_maps/src/main/patch/google_maps.patch
@@ -1,7 +1,9 @@
-diff --git a/google_Maps/target/downloads/google_maps_api_v3_11.js b/google_Maps/target/downloads/google_maps_api_v3_11.js
+
+Generated from Ant script
+diff --git a/google_maps/target/downloads/google_maps_api_v3_11.js b/google_maps/target/downloads/google_maps_api_v3_11.js
 index ac91685..5dbb628 100644
---- a/google_Maps/target/downloads/google_maps_api_v3_11.js
-+++ b/google_Maps/target/downloads/google_maps_api_v3_11.js
+--- a/google_maps/target/downloads/google_maps_api_v3_11.js
++++ b/google_maps/target/downloads/google_maps_api_v3_11.js
 @@ -20,6 +20,11 @@
   * @externs
   */

http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/aca1ec4a/jasmine/build.xml
----------------------------------------------------------------------
diff --git a/jasmine/build.xml b/jasmine/build.xml
index 4ebe95e..5ff9255 100644
--- a/jasmine/build.xml
+++ b/jasmine/build.xml
@@ -21,6 +21,62 @@
 
 <project name="jasmine" default="main" basedir=".">
     
+    <property name="FLEXJS_HOME" value="${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/lib">
+        <and>
+            <not>
+                <isset property="FALCON_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
type="file" />
+        </and>
+    </condition>
+    
+    <condition property="FALCON_HOME" value="${FLEXJS_HOME}">
+        <and>
+            <not>
+                <isset property="FALCON_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/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}/js">
+        <and>
+            <not>
+                <isset property="FALCONJX_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/js/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>
+        
     <target name="main" depends="preprocess, externc, postprocess, compc" />
 
     <target name="preprocess">
@@ -29,7 +85,7 @@
     </target>
     
     <target name="externc" >
-        <java jar="${basedir}/../../compiler-jx/lib/externc.jar" fork="true"
+        <java jar="${FALCONJX_HOME}/lib/externc.jar" fork="true"
             failonerror="false">
             <arg value="+flexlib=externs" />
             <arg value="-debug" />
@@ -43,7 +99,7 @@
     <target name="compc" >
         <copy file="${basedir}/src/main/config/compile-as-config.xml"
         todir="${basedir}/target" />
-        <java jar="${basedir}/../../compiler/lib/falcon-compc.jar" fork="true"
+        <java jar="${FALCON_HOME}/falcon-compc.jar" fork="true"
             failonerror="true">
             <arg value="+flexlib=externs/frameworks" />
             <arg value="-debug" />

http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/aca1ec4a/jquery/build.xml
----------------------------------------------------------------------
diff --git a/jquery/build.xml b/jquery/build.xml
index 5093931..a510ba9 100644
--- a/jquery/build.xml
+++ b/jquery/build.xml
@@ -21,10 +21,66 @@
 
 <project name="jquery" default="main" basedir=".">
     
+    <property name="FLEXJS_HOME" value="${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/lib">
+        <and>
+            <not>
+                <isset property="FALCON_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
type="file" />
+        </and>
+    </condition>
+    
+    <condition property="FALCON_HOME" value="${FLEXJS_HOME}">
+        <and>
+            <not>
+                <isset property="FALCON_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/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}/js">
+        <and>
+            <not>
+                <isset property="FALCONJX_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/js/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>
+    
     <target name="main" depends="preprocess, externc, postprocess, compc" />
 
     <target name="preprocess" depends="download">
-        <exec executable="git" dir="${basedir}/../..">
+        <exec executable="git" dir="${basedir}/..">
             <arg value="apply"/>
             <arg value="--ignore-whitespace"/>
             <arg value="--whitespace=nowarn"/>
@@ -42,15 +98,22 @@
     <target name="diff" >
         <delete dir="${basedir}/src/main/patch" />
         <mkdir dir="${basedir}/src/main/patch" />
-        <exec executable="git" output="${basedir}/src/main/patch/jquery.patch" >
+        <exec executable="git" output="${basedir}/src/main/patch/jquery.temp.patch" >
             <arg value="diff"/>
             <arg value="--no-index"/>
             <arg value="--"/>
             <arg value="${basedir}/target/reference"/>
             <arg value="${basedir}/target/downloads"/>
         </exec>
-        <replace file="${basedir}/src/main/patch/jquery.patch" token="target/reference"
value="target/downloads" />
-        <replace file="${basedir}/src/main/patch/jquery.patch" token="${basedir}/target/downloads"
value="/externs/jquery/target/downloads" />
+        <replace file="${basedir}/src/main/patch/jquery.temp.patch" token="target/reference"
value="target/downloads" />
+        <replace file="${basedir}/src/main/patch/jquery.temp.patch" token="${basedir}/target/downloads"
value="/jquery/target/downloads" />
+        <concat destfile="${basedir}/src/main/patch/jquery.patch" >
+            <header filtering="no" trimleading="yes">
+                Generated from Ant script
+            </header>
+            <filelist dir="${basedir}/src/main/patch" files="jquery.temp.patch"/>
+        </concat>
+        <delete file="${basedir}/src/main/patch/jquery.temp.patch" />
     </target>
 
     <target name="download" >
@@ -59,7 +122,7 @@
     </target>
     
     <target name="externc" >
-        <java jar="${basedir}/../../compiler-jx/lib/externc.jar" fork="true"
+        <java jar="${FALCONJX_HOME}/lib/externc.jar" fork="true"
             failonerror="false">
             <arg value="+flexlib=externs" />
             <arg value="-debug" />
@@ -73,7 +136,7 @@
     <target name="compc" >
         <copy file="${basedir}/src/main/config/compile-as-config.xml"
         todir="${basedir}/target" />
-        <java jar="${basedir}/../../compiler/lib/falcon-compc.jar" fork="true"
+        <java jar="${FALCON_HOME}/falcon-compc.jar" fork="true"
             failonerror="true">
             <arg value="+flexlib=externs/frameworks" />
             <arg value="-debug" />

http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/aca1ec4a/jquery/src/main/patch/jquery.patch
----------------------------------------------------------------------
diff --git a/jquery/src/main/patch/jquery.patch b/jquery/src/main/patch/jquery.patch
index fc32904..7ef865f 100644
--- a/jquery/src/main/patch/jquery.patch
+++ b/jquery/src/main/patch/jquery.patch
@@ -1,3 +1,5 @@
+
+Generated from Ant script
 diff --git a/jquery/target/downloads/jquery-1.9.js b/jquery/target/downloads/jquery-1.9.js
 index d00166a..1d85908 100644
 --- a/jquery/target/downloads/jquery-1.9.js

http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/aca1ec4a/js/build.xml
----------------------------------------------------------------------
diff --git a/js/build.xml b/js/build.xml
index b2fdb56..a050b98 100644
--- a/js/build.xml
+++ b/js/build.xml
@@ -21,11 +21,68 @@
 
 <project name="js" default="main" basedir=".">
     
+    <property name="FLEXJS_HOME" value="${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/lib">
+        <and>
+            <not>
+                <isset property="FALCON_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
type="file" />
+        </and>
+    </condition>
+    
+    <condition property="FALCON_HOME" value="${FLEXJS_HOME}">
+        <and>
+            <not>
+                <isset property="FALCON_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/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}/js">
+        <and>
+            <not>
+                <isset property="FALCONJX_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/js/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>
+    
     <target name="main" depends="preprocess, externc, postprocess, compc" />
 
     <target name="download" >
+        <echo>${FLEXJS_HOME}</echo>
         <mkdir dir="${basedir}/target/temp/externs" />
-        <unjar src="${basedir}/../../compiler-jx/lib/google/closure-compiler/compiler.jar"
+        <unjar src="${FALCONJX_HOME}/lib/google/closure-compiler/compiler.jar"
             dest="${basedir}/target/temp/externs">
             <patternset>
                 <include name="externs.zip"/>
@@ -54,19 +111,26 @@
     <target name="diff" >
         <delete dir="${basedir}/src/main/patch" />
         <mkdir dir="${basedir}/src/main/patch" />
-        <exec executable="git" output="${basedir}/src/main/patch/js.patch" >
+        <exec executable="git" output="${basedir}/src/main/patch/js.temp.patch" >
             <arg value="diff"/>
             <arg value="--no-index"/>
             <arg value="--"/>
             <arg value="${basedir}/target/reference"/>
             <arg value="${basedir}/target/downloads"/>
         </exec>
-        <replace file="${basedir}/src/main/patch/js.patch" token="target/reference" value="target/downloads"
/>
-        <replace file="${basedir}/src/main/patch/js.patch" token="${basedir}/target/downloads"
value="/externs/js/target/downloads" />
+        <replace file="${basedir}/src/main/patch/js.temp.patch" token="target/reference"
value="target/downloads" />
+        <replace file="${basedir}/src/main/patch/js.temp.patch" token="${basedir}/target/downloads"
value="/js/target/downloads" />
+        <concat destfile="${basedir}/src/main/patch/js.patch" >
+            <header filtering="no" trimleading="yes">
+                Generated from Ant script
+            </header>
+            <filelist dir="${basedir}/src/main/patch" files="js.temp.patch"/>
+        </concat>
+        <delete file="${basedir}/src/main/patch/js.temp.patch" />
     </target>
 
     <target name="preprocess" depends="download">
-        <exec executable="git" dir="${basedir}/../..">
+        <exec executable="git" dir="${basedir}/..">
             <arg value="apply"/>
             <arg value="--ignore-whitespace"/>
             <arg value="--whitespace=nowarn"/>
@@ -75,7 +139,7 @@
     </target>
 
     <target name="externc" >
-        <java jar="${basedir}/../../compiler-jx/lib/externc.jar" fork="true"
+        <java jar="${FALCONJX_HOME}/lib/externc.jar" fork="true"
             failonerror="false">
             <arg value="+flexlib=externs" />
             <arg value="-debug" />
@@ -92,7 +156,7 @@
     <target name="compc" >
         <copy file="${basedir}/src/main/config/compile-as-config.xml"
             todir="${basedir}/target" />
-        <java jar="${basedir}/../../compiler/lib/falcon-compc.jar" fork="true"
+        <java jar="${FALCON_HOME}/falcon-compc.jar" fork="true"
             failonerror="true">
             <arg value="+flexlib=externs/frameworks" />
             <arg value="-debug" />

http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/aca1ec4a/js/src/main/patch/js.patch
----------------------------------------------------------------------
diff --git a/js/src/main/patch/js.patch b/js/src/main/patch/js.patch
index a9b25b4..fb43f70 100644
--- a/js/src/main/patch/js.patch
+++ b/js/src/main/patch/js.patch
@@ -1,3 +1,5 @@
+
+Generated from Ant script
 diff --git a/js/target/downloads/es3.js b/js/target/downloads/es3.js
 index fa5e5a6..6c5e3e7 100644
 --- a/js/target/downloads/es3.js

http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/aca1ec4a/node/build.xml
----------------------------------------------------------------------
diff --git a/node/build.xml b/node/build.xml
index 2731afc..736c4ed 100644
--- a/node/build.xml
+++ b/node/build.xml
@@ -21,6 +21,62 @@
 
 <project name="node" default="main" basedir=".">
     
+    <property name="FLEXJS_HOME" value="${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/lib">
+        <and>
+            <not>
+                <isset property="FALCON_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/../flex-falcon/compiler/lib/falcon-mxmlc.jar"
type="file" />
+        </and>
+    </condition>
+    
+    <condition property="FALCON_HOME" value="${FLEXJS_HOME}">
+        <and>
+            <not>
+                <isset property="FALCON_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/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}/js">
+        <and>
+            <not>
+                <isset property="FALCONJX_HOME" />
+            </not>
+            <available file="${FLEXJS_HOME}/js/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>
+        
     <target name="main" depends="preprocess, externc, postprocess, compc" />
 
     <target name="preprocess">
@@ -56,7 +112,7 @@
     </target>
     
     <target name="externc" >
-        <java jar="${basedir}/../../compiler-jx/lib/externc.jar" fork="true"
+        <java jar="${FALCONJX_HOME}/lib/externc.jar" fork="true"
             failonerror="false">
             <arg value="+flexlib=externs" />
             <arg value="-debug" />
@@ -70,7 +126,7 @@
     <target name="compc" >
         <copy file="${basedir}/src/main/config/compile-as-config.xml"
         todir="${basedir}/target" />
-        <java jar="${basedir}/../../compiler/lib/falcon-compc.jar" fork="true"
+        <java jar="${FALCON_HOME}/falcon-compc.jar" fork="true"
             failonerror="true">
             <arg value="+flexlib=externs/frameworks" />
             <arg value="-debug" />


Mime
View raw message