Author: kkolinko
Date: Fri Jun 27 15:01:55 2014
New Revision: 1606114

URL: http://svn.apache.org/r1606114
Log:
When Eclipse Compiler JAR is updated, make sure to delete its old version from 
the build/lib directory.

Modified:
    tomcat/trunk/build.xml
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1606114&r1=1606113&r2=1606114&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Jun 27 15:01:55 2014
@@ -1044,10 +1044,19 @@
       <filterset refid="version.filters"/>
     </copy>
 
+    <!-- Delete all other versions of Eclipse JDT Compiler and copy the 
current one -->
+    <local name="jdt.jar.filename" />
+    <basename property="jdt.jar.filename" file="${jdt.jar}"/>
+    <delete verbose="true">
+      <fileset dir="${tomcat.build}/lib">
+        <include name="ecj-*.jar"/>
+        <exclude name="${jdt.jar.filename}"/>
+      </fileset>
+    </delete>
+    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
+
     <!-- Add sources for examples -->
     <antcall target="examples-sources" />
-
-    <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
   </target>
 
   <target name="compile-webapp-examples" >

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1606114&r1=1606113&r2=1606114&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jun 27 15:01:55 2014
@@ -125,6 +125,11 @@
         Update the API stability section of the release notes now that Tomcat 8
         has had its first stable release. (markt)
       </update>
+      <update>
+        Improve <code>build.xml</code> so that when Eclipse JDT Compiler is
+        updated, it will delete the old JAR from <code>build/lib</code>
+        directory. (kkolinko)
+      </update>
     </changelog>
   </subsection>
 </section>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to