incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1421438 - in /incubator/flex/sdk/branches/develop: ./ frameworks/build.xml modules/downloads.xml
Date Thu, 13 Dec 2012 19:29:55 GMT
Author: cframpton
Date: Thu Dec 13 19:29:54 2012
New Revision: 1421438

URL: http://svn.apache.org/viewvc?rev=1421438&view=rev
Log:
Merge 1421400 from release4.9 to develop.  build.xml is also a merged file but it should have
been included in rev 1421347.

Modified:
    incubator/flex/sdk/branches/develop/   (props changed)
    incubator/flex/sdk/branches/develop/frameworks/build.xml
    incubator/flex/sdk/branches/develop/modules/downloads.xml

Propchange: incubator/flex/sdk/branches/develop/
------------------------------------------------------------------------------
  Merged /incubator/flex/sdk/branches/release4.9:r1421400

Modified: incubator/flex/sdk/branches/develop/frameworks/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/build.xml?rev=1421438&r1=1421437&r2=1421438&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/build.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/build.xml Thu Dec 13 19:29:54 2012
@@ -295,7 +295,7 @@
         <delete dir="${FLEX_HOME}/runtimes"/>
         <delete includeEmptyDirs="true" failonerror="false">
             <fileset dir="${FLEX_HOME}/samples">
-                <include name="badges/**" />
+                <include name="badge/**" />
                 <include name="descriptor-sample.xml" />
                 <include name="icons/**" />
             </fileset>

Modified: incubator/flex/sdk/branches/develop/modules/downloads.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/modules/downloads.xml?rev=1421438&r1=1421437&r2=1421438&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/modules/downloads.xml (original)
+++ incubator/flex/sdk/branches/develop/modules/downloads.xml Thu Dec 13 19:29:54 2012
@@ -256,7 +256,7 @@
             Make sure any left-over batik 1.6 libraries are removed to avoid compile errors.
 
             (super-clean/batik-jars-clean would take also take care of this.)
         -->
-	    <delete dir="${basedir}/${batik.dir}/lib" failonerror="false"/>
+     	<delete dir="${basedir}/${batik.dir}/lib/**" failonerror="false"/>
 
         <copy todir="${basedir}/${batik.dir}/lib" failonerror="true">
             <fileset dir="${download.dir}/${batik.zip.dir}/lib">
@@ -278,9 +278,10 @@
     </target>
     
 	<target name="batik-jars-clean">
-        <delete includeEmptyDirs="false" failonerror="fasle">
-            <fileset dir="${basedir}/${batik.dir}">
-                <include name="lib/**"/>
+	    <!-- leave the lib directory itself since batik build.xml expects it -->
+        <delete includeEmptyDirs="true" failonerror="false">
+            <fileset dir="${basedir}/${batik.dir}/lib">
+                <include name="**/**"/>
             </fileset>            
         </delete>
         <delete includeEmptyDirs="true" failonerror="fasle">



Mime
View raw message