incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1402575 - in /incubator/flex/sdk/branches/develop/modules: downloads.xml thirdparty/batik/build.xml
Date Fri, 26 Oct 2012 17:04:18 GMT
Author: cframpton
Date: Fri Oct 26 17:04:18 2012
New Revision: 1402575

URL: http://svn.apache.org/viewvc?rev=1402575&view=rev
Log:
When downloading the batik 1.7 jars, make sure to clean up any left over batik 1.6 jars to
avoid compile errors.  ant super-clean also does this.

Modified:
    incubator/flex/sdk/branches/develop/modules/downloads.xml
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/build.xml

Modified: incubator/flex/sdk/branches/develop/modules/downloads.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/modules/downloads.xml?rev=1402575&r1=1402574&r2=1402575&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/modules/downloads.xml (original)
+++ incubator/flex/sdk/branches/develop/modules/downloads.xml Fri Oct 26 17:04:18 2012
@@ -234,9 +234,9 @@
     -->
     
     <target name="batik-jars-check" description="Checks if batik jars exists.">
-        <!-- this implies the lib dir and its jars also exist -->
         <condition property="batik.jars.exists">
             <and>
+                <!-- this implies the lib dir and its jars also exist -->
     	        <available file="${basedir}/${batik.dir}/lib/build" type="dir" />
     	        <available file="${lib.ext.dir}/xml-apis-ext.jar"/>
     	    </and>
@@ -252,6 +252,12 @@
             <param name="md5" value="c117ca2241907f62a2b3031167ebf917"/>
         </antcall>
 
+        <!-- 
+            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"/>
+
         <copy todir="${basedir}/${batik.dir}/lib" failonerror="true">
             <fileset dir="${download.dir}/${batik.zip.dir}/lib">
                 <include name="**/**"/>

Modified: incubator/flex/sdk/branches/develop/modules/thirdparty/batik/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/modules/thirdparty/batik/build.xml?rev=1402575&r1=1402574&r2=1402575&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/modules/thirdparty/batik/build.xml (original)
+++ incubator/flex/sdk/branches/develop/modules/thirdparty/batik/build.xml Fri Oct 26 17:04:18
2012
@@ -1138,6 +1138,7 @@ JAVA=/usr/bin/java
   <target name="batik-all-flex-clean" depends="init, clean-compile"
     description="cleans files generated by batik-all-flex-jar">
     <delete file="${FLEX_LIB}/batik-all-flex.jar" failonerror="false"/>
+    <delete dir="${build}"/>
   </target>
   
   <!--====== END additions for Apache Flex =========-->



Mime
View raw message