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
commit 456302798063101d89b1a2b91d731d8c3f198bf3
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 4 18:30:41 2025 +0000
Better fix for Windows
---
build.xml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index c574842c6d..32521dd7a3 100644
--- a/build.xml
+++ b/build.xml
@@ -2635,6 +2635,10 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
<exec executable="${nsis.executable.unix}"
outputproperty="nsis.executable.unix.version">
<arg value="-VERSION"/>
</exec>
+ </target>
+
+ <target name="-installer-set-properties-3"
+ depends="-installer-set-properties-2">
<condition property="nsis.executable.unix.version.ok">
<or>
<os family="windows"/>
@@ -2657,7 +2661,7 @@ To skip building the Windows installer, set the
skip.installer property in build
</target>
<target name="-installer-check-version"
- depends="-installer-set-properties-2"
+ depends="-installer-set-properties-3"
unless="${nsis.executable.unix.version.ok}">
<fail message="An executable makensis was found at: ${nsis.executable.unix}
with version [${nsis.executable.unix.version}] but version [v${nsis.version}]
is required
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
