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 a6faa71a9ef3aa45f9ee8776e32103afbd0c33dd
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 4 17:01:25 2025 +0000
Fix build on windows
---
build.xml | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/build.xml b/build.xml
index c574842c6d..4dd0f3f4ce 100644
--- a/build.xml
+++ b/build.xml
@@ -2627,12 +2627,9 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
<istrue value="${skip.installer}"/>
</or>
</condition>
- </target>
-
- <target name="-installer-set-properties-2"
- depends="-installer-set-properties-1"
- if="nsis.executable.unix">
- <exec executable="${nsis.executable.unix}"
outputproperty="nsis.executable.unix.version">
+ <exec executable="${nsis.executable.unix}"
+ osfamily="unix"
+ outputproperty="nsis.executable.unix.version">
<arg value="-VERSION"/>
</exec>
<condition property="nsis.executable.unix.version.ok">
@@ -2657,7 +2654,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-1"
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
