You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2014/06/27 17:01:56 UTC

svn commit: r1606114 - in /tomcat/trunk: build.xml webapps/docs/changelog.xml

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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Re: svn commit: r1606114 - in /tomcat/trunk: build.xml webapps/docs/changelog.xml

Posted by Mark Thomas <ma...@apache.org>.
On 27/06/2014 18:21, Konstantin Kolinko wrote:
> 2014-06-27 20:52 GMT+04:00 Mark Thomas <ma...@apache.org>:
>> On 27/06/2014 16:01, kkolinko@apache.org wrote:
>>> 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.
>>
>> -1. I use a shared lib directory for multiple Tomcat versions (to save
>> having multiple copies of the same libs) and this breaks that.
> 
> This change is about duplicates in output/build/lib directory.. It
> does not change anything for ${base.path} directory where the
> libraries are downloaded.
> 
> How does your configuration behave when you have both
> output/build/lib/ecj-4.4RC4.jar  and
> output/build/lib/ecj-4.4.jar
> in Tomcat's ${catalina.home}/lib directory at runtime?
> 
> 
> I think this is useful, but I can revert this commit, as ECJ version
> updates do not happen often.

My bad. Ignore my -1.

Mark


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


Re: svn commit: r1606114 - in /tomcat/trunk: build.xml webapps/docs/changelog.xml

Posted by Konstantin Kolinko <kn...@gmail.com>.
2014-06-27 20:52 GMT+04:00 Mark Thomas <ma...@apache.org>:
> On 27/06/2014 16:01, kkolinko@apache.org wrote:
>> 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.
>
> -1. I use a shared lib directory for multiple Tomcat versions (to save
> having multiple copies of the same libs) and this breaks that.

This change is about duplicates in output/build/lib directory.. It
does not change anything for ${base.path} directory where the
libraries are downloaded.

How does your configuration behave when you have both
output/build/lib/ecj-4.4RC4.jar  and
output/build/lib/ecj-4.4.jar
in Tomcat's ${catalina.home}/lib directory at runtime?


I think this is useful, but I can revert this commit, as ECJ version
updates do not happen often.

Best regards,
Konstantin Kolinko

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


Re: svn commit: r1606114 - in /tomcat/trunk: build.xml webapps/docs/changelog.xml

Posted by Mark Thomas <ma...@apache.org>.
On 27/06/2014 16:01, kkolinko@apache.org wrote:
> 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.

-1. I use a shared lib directory for multiple Tomcat versions (to save
having multiple copies of the same libs) and this breaks that.

Also, we don't do this (and never have done this) for any other lib so I
see no reason to just do it for this one.

Mark


> 
> 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-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
> 


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