flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [1/2] git commit: [flex-falcon] [refs/heads/develop] - don't do bin-legacy and lib-legacy copy if flexjs install
Date Sat, 25 Apr 2015 05:18:25 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/develop 124d2299f -> 0cf4078dd


don't do bin-legacy and lib-legacy copy if flexjs install


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

Branch: refs/heads/develop
Commit: f29108947a0ecaa15da7b35c761d9577f757419f
Parents: 124d229
Author: Alex Harui <aharui@apache.org>
Authored: Fri Apr 24 22:17:53 2015 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Fri Apr 24 22:17:53 2015 -0700

----------------------------------------------------------------------
 installer.xml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2910894/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 63b4603..c9d078f 100644
--- a/installer.xml
+++ b/installer.xml
@@ -110,7 +110,7 @@
         <copy file="${basedir}/js/lib/google/closure-compiler/compiler-LICENSE.txt" tofile="${FLEX_HOME}/js/lib/google/closure-compiler/compiler-LICENSE.txt"/>
     </target>
     
-    <target name="movefiles" description="move SDK files into -legacy folders" >
+    <target name="movefiles" description="move SDK files into -legacy folders" unless="flexjs">
         <mkdir dir="${FLEX_HOME}/bin-legacy" />
         <mkdir dir="${FLEX_HOME}/lib-legacy" />
         <move todir="${FLEX_HOME}/lib-legacy" overwrite="true" includeEmptyDirs="false">
@@ -132,11 +132,7 @@
                 <include name="**/*"/>
             </fileset>
         </copy>
-        <copy todir="${FLEX_HOME}/bin-legacy" overwrite="true" includeEmptyDirs="false">
-            <fileset dir="${FALCON_HOME}/compiler/generated/dist/sdk/bin-legacy">
-                <include name="**/*"/>
-            </fileset>
-        </copy>
+        <antcall target="bin-legacy" />
         <copy todir="${FLEX_HOME}/lib" overwrite="true" includeEmptyDirs="false">
             <fileset dir="${FALCON_HOME}/compiler/generated/dist/sdk/lib">
                 <include name="**"/>
@@ -151,6 +147,14 @@
             </fileset>
         </copy>
     </target>
+
+    <target name="bin-legacy" unless="flexjs">
+        <copy todir="${FLEX_HOME}/bin-legacy" overwrite="true" includeEmptyDirs="false">
+            <fileset dir="${FALCON_HOME}/compiler/generated/dist/sdk/bin-legacy">
+                <include name="**/*"/>
+            </fileset>
+        </copy>
+    </target>
     
     <target name="copyfiles.jx" if="install.jx" description="copy FalconJX files into
SDK" >
         <mkdir dir="${FLEX_HOME}/js/bin" />


Mime
View raw message