This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 62ac678838 Only build with makensis when configured
62ac678838 is described below
commit 62ac678838973e77355ff2f38986ea57225c9aba
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 d3528c2be1..9d6123ea03 100644
--- a/build.xml
+++ b/build.xml
@@ -2624,10 +2624,14 @@
</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
