This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new ab38555621 Only build with makensis when configured
ab38555621 is described below
commit ab385556211ba2fa42436763b10750be09f2ab42
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 4 16:35:43 2025 +0000
Only build with makensis when configured
---
build.xml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index 75cb4bd2fe..c574842c6d 100644
--- a/build.xml
+++ b/build.xml
@@ -2605,10 +2605,14 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
</or>
</condition>
<condition property="nsis.executable.unix"
value="${nsis.bin.home}/Bin/makensis">
- <available file="makensis" filepath="${nsis.bin.home}/Bin"/>
+ <and>
+ <equals arg1="${nsis.tool}" arg2="makensis" forcestring="true"/>
+ <available file="makensis" filepath="${nsis.bin.home}/Bin"/>
+ </and>
</condition>
<condition property="nsis.executable.unix" value="makensis">
<and>
+ <equals arg1="${nsis.tool}" arg2="makensis" forcestring="true"/>
<available file="makensis" filepath="${env.PATH}"/>
<not>
<available file="makensis" filepath="${nsis.bin.home}/Bin"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
