Author: kkolinko
Date: Wed Feb 10 13:10:51 2010
New Revision: 908484
URL: http://svn.apache.org/viewvc?rev=908484&view=rev
Log:
Improvements for building jasper-jdt.jar:
- Rebuild jasper-jdt.jar if jdt.jar was updated or redownloaded, or the build
file was updated
- Purge target directory before unjarring, to avoid repacking stale files
- Clean unjarred files after the build as they are not needed
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=908484&r1=908483&r2=908484&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Feb 10 13:10:51 2010
@@ -1664,13 +1664,14 @@
<param name="destfile" value="${jdt.jar}"/>
<param name="destdir" value="${jdt.home}"/>
</antcall>
- <mkdir dir="${jasper-jdt.home}"/>
<condition property="no.build.jasper-jdt">
- <available file="${jasper-jdt.jar}"/>
+ <and>
+ <available file="${jasper-jdt.jar}"/>
+ <uptodate targetfile="${jasper-jdt.jar}" srcfile="${jdt.jar}"/>
+ <uptodate targetfile="${jasper-jdt.jar}"
srcfile="${basedir}/build.xml"/>
+ </and>
</condition>
- <antcall target="build-jasper-jdt">
- <param name="basedir" value="${jasper-jdt.home}" />
- </antcall>
+ <antcall target="build-jasper-jdt" />
</target>
@@ -1764,6 +1765,8 @@
<target name="build-jasper-jdt" depends="build-manifests"
unless="no.build.jasper-jdt">
+ <delete dir="${jasper-jdt.home}"/>
+ <mkdir dir="${jasper-jdt.home}"/>
<unjar src="${jdt.jar}" dest="${jasper-jdt.home}" />
<jarIt jarfile="${jasper-jdt.jar}"
filesDir="${jasper-jdt.home}"
@@ -1771,6 +1774,12 @@
manifest="${tomcat.manifests}/default.manifest"
notice="${tomcat.home}/res/META-INF/jasper-jdt.jar.notice"
license="${tomcat.home}/res/META-INF/jasper-jdt.jar.license"/>
+ <delete includeEmptyDirs="true">
+ <fileset dir="${jasper-jdt.home}">
+ <include name="**/*"/>
+ <exclude name="jasper-jdt.jar"/>
+ </fileset>
+ </delete>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
