You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2025/03/06 22:16:03 UTC
(tomcat) branch 9.0.x updated: More skip.installer, remove unless in depends-only target
This is an automated email from the ASF dual-hosted git repository.
rjung pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new d7b0d6236e More skip.installer, remove unless in depends-only target
d7b0d6236e is described below
commit d7b0d6236e5643e254785a45213c73714e9b2113
Author: Rainer Jung <ra...@kippdata.de>
AuthorDate: Thu Mar 6 23:15:53 2025 +0100
More skip.installer, remove unless in depends-only target
---
build.xml | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/build.xml b/build.xml
index 8e6df4662d..1cb77d6c48 100644
--- a/build.xml
+++ b/build.xml
@@ -2669,8 +2669,7 @@ You may need a custom build of makensis. Instructions for this may be found in B
</target>
<target name="-installer-checks"
- depends="-installer-check-available,-installer-check-version"
- unless="${installer.ok}">
+ depends="-installer-check-available,-installer-check-version">
</target>
<target name="-installer-prep"
@@ -2697,7 +2696,9 @@ You may need a custom build of makensis. Instructions for this may be found in B
</touch>
</target>
- <target name="-installer-wine" if="${wine.ok}">
+ <target name="-installer-wine"
+ if="${wine.ok}"
+ unless="${skip.installer}">
<exec dir="${tomcat.dist}" executable="wine" osfamily="unix">
<arg value="${nsis.executable.windows}"/>
<arg value="/DNSISDIR=${nsis.bin.home}"/>
@@ -2706,7 +2707,9 @@ You may need a custom build of makensis. Instructions for this may be found in B
</exec>
</target>
- <target name="-installer-makensis" if="nsis.executable.unix">
+ <target name="-installer-makensis"
+ if="nsis.executable.unix"
+ unless="${skip.installer}">
<echo message="Using makensis: ${nsis.executable.unix} version [${nsis.executable.unix.version}]"/>
<exec dir="${tomcat.dist}" executable="${nsis.executable.unix}" osfamily="unix">
<arg value="-DNSISDIR=${nsis.bin.home}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org