You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cf...@apache.org on 2012/05/29 17:39:30 UTC

svn commit: r1343784 - in /incubator/flex/trunk/modules: build.xml thirdparty/velocity/

Author: cframpton
Date: Tue May 29 15:39:29 2012
New Revision: 1343784

URL: http://svn.apache.org/viewvc?rev=1343784&view=rev
Log:
Copy batik LICENSE and NOTICE to lib directory.  It got inadvertently removed during the reorganization of this directory.  Ignore the velocity bin directory.

Modified:
    incubator/flex/trunk/modules/build.xml
    incubator/flex/trunk/modules/thirdparty/velocity/   (props changed)

Modified: incubator/flex/trunk/modules/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/build.xml?rev=1343784&r1=1343783&r2=1343784&view=diff
==============================================================================
--- incubator/flex/trunk/modules/build.xml (original)
+++ incubator/flex/trunk/modules/build.xml Tue May 29 15:39:29 2012
@@ -172,11 +172,20 @@
             <arg value="${basedir}/thirdparty/batik/sources/batik-all-flex.mf"/>
             <arg value="${FLEX_LIB}/batik-all-flex.jar"/>
         </exec>
+		<copy todir="${FLEX_LIB}">
+            <fileset dir="${basedir}/thirdparty/batik">
+                <include name="LICENSE"/>
+                <include name="NOTICE"/>
+            </fileset>            
+            <globmapper from="*" to="batik-*"/>
+        </copy>
 	</target>
 
 	<target name="batik-clean">
 		<ant dir="${basedir}/thirdparty/batik" target="clean"/>
         <delete file="${FLEX_LIB}/batik-all-flex.jar"/>
+        <delete file="${FLEX_LIB}/batik-LICENSE"/>
+        <delete file="${FLEX_LIB}/batik-NOTICE"/>
 	</target>
 	
     <target name="velocity" description="Build velocity-dep-1.4-flex.jar">

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue May 29 15:39:29 2012
@@ -1 +1 @@
-merged
+bin