This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 2fa8312 Only build JAR files when contents is not up to date
2fa8312 is described below
commit 2fa8312372223dcc77064a297f5afe787f2a5f6b
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Sep 17 16:04:29 2020 +0100
Only build JAR files when contents is not up to date
---
build.xml | 29 +++++++++++++++++++++--------
webapps/docs/changelog.xml | 8 ++++++++
2 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/build.xml b/build.xml
index e6c5798..9095535 100644
--- a/build.xml
+++ b/build.xml
@@ -3329,17 +3329,30 @@ Read the Building page on the Apache Tomcat
documentation site for details on ho
<attribute name="meta-inf" description="additional contents for META-INF"
default="${tomcat.manifests}/default" />
<sequential>
- <jar jarfile="@{jarfile}" manifest="@{manifest}">
- <fileset dir="@{filesDir}">
+ <local name="jar.uptodate"/>
+ <uptodate property="jar.uptodate" targetfile="@{jarfile}" >
+ <srcfiles dir="@{filesDir}">
<patternset refid="@{filesId}"/>
<!-- Javadoc exclusions -->
<exclude name="**/package.html" />
- </fileset>
- <zipfileset dir="@{meta-inf}" prefix="META-INF/"
- excludes=".gitignore" />
- <zipfileset file="@{notice}" fullpath="META-INF/NOTICE" />
- <zipfileset file="@{license}" fullpath="META-INF/LICENSE" />
- </jar>
+ </srcfiles>
+ <srcfiles dir="@{meta-inf}" excludes=".gitignore" />
+ <srcfiles file="@{notice}" />
+ <srcfiles file="@{license}" />
+ </uptodate>
+ <sequential unless:true="${jar.uptodate}">
+ <jar jarfile="@{jarfile}" manifest="@{manifest}" >
+ <fileset dir="@{filesDir}">
+ <patternset refid="@{filesId}"/>
+ <!-- Javadoc exclusions -->
+ <exclude name="**/package.html" />
+ </fileset>
+ <zipfileset dir="@{meta-inf}" prefix="META-INF/"
+ excludes=".gitignore" />
+ <zipfileset file="@{notice}" fullpath="META-INF/NOTICE" />
+ <zipfileset file="@{license}" fullpath="META-INF/LICENSE" />
+ </jar>
+ </sequential>
</sequential>
</macrodef>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fe1c04e..0d99e7f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -68,6 +68,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <add>
+ When building, only rebuild JAR files if the contents has changed.
+ (markt)
+ </add>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.106 (violetagg)" rtext="release in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
