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
commit 2b56981abe9c9b9d8bf38571183a718dbf5d2c6f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 4 18:25:00 2025 +0000
Revert "Fix build on windows"
This reverts commit 2b283d1158347e11c79313f008bbdbbd36251625.
---
build.xml | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/build.xml b/build.xml
index 275e19a5b8..9d6123ea03 100644
--- a/build.xml
+++ b/build.xml
@@ -2646,9 +2646,12 @@
<istrue value="${skip.installer}"/>
</or>
</condition>
- <exec executable="${nsis.executable.unix}"
- osfamily="unix"
- outputproperty="nsis.executable.unix.version">
+ </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">
<arg value="-VERSION"/>
</exec>
<condition property="nsis.executable.unix.version.ok">
@@ -2673,7 +2676,7 @@ To skip building the Windows installer, set the
skip.installer property in build
</target>
<target name="-installer-check-version"
- depends="-installer-set-properties-1"
+ depends="-installer-set-properties-2"
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
