flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1404644 - in /incubator/flex/falcon/trunk/compiler: ./ build.xml
Date Thu, 01 Nov 2012 15:30:28 GMT
Author: cframpton
Date: Thu Nov  1 15:30:27 2012
New Revision: 1404644

URL: http://svn.apache.org/viewvc?rev=1404644&view=rev
Log:
Fix prior commit 1403867.  Should have copied flexTasks.jar from ant/lib not antTasks.jar.
 Also ignore sdk and generated directories.

Modified:
    incubator/flex/falcon/trunk/compiler/   (props changed)
    incubator/flex/falcon/trunk/compiler/build.xml

Propchange: incubator/flex/falcon/trunk/compiler/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Nov  1 15:30:27 2012
@@ -0,0 +1,2 @@
+generated
+lib

Modified: incubator/flex/falcon/trunk/compiler/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/falcon/trunk/compiler/build.xml?rev=1404644&r1=1404643&r2=1404644&view=diff
==============================================================================
--- incubator/flex/falcon/trunk/compiler/build.xml (original)
+++ incubator/flex/falcon/trunk/compiler/build.xml Thu Nov  1 15:30:27 2012
@@ -763,8 +763,12 @@
                 <exclude name="frameworks/projects/**/*"/>
              </fileset>
         </copy>
-        <!-- if sdk.branch is set to binary distro antTasks is in a different place -->
-        <copy file="${sdk.branch}/ant/lib/antTasks.jar" todir="${sdk}/lib" failonerror="false"/>
+        <!-- If sdk.branch is set to binary distro flexTasks is in a different place.
-->
+        <copy todir="${sdk}/lib" failOnError="false" overwrite="false">
+            <fileset dir="${sdk.branch}/ant/lib">
+                <include name="flexTasks.jar"/>
+            </fileset>
+        </copy>    
         <copy todir="${sdk}/bin-legacy" includeEmptyDirs="false">
             <fileset dir="${sdk.branch}/bin">
                 <include name="**/*"/>



Mime
View raw message