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 24e8b40729239c3642d62f601222b40fca0b5203
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 4 16:12:39 2025 +0000
Fix version check
---
build.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index f5e9e6907a..d21f3521a1 100644
--- a/build.xml
+++ b/build.xml
@@ -2634,7 +2634,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
<condition property="nsis.executable.unix.version.ok">
<or>
<os family="windows"/>
- <equals arg1="nsis.version" arg2="nsis.executable.unix.version"/>
+ <equals arg1="v${nsis.version}"
arg2="${nsis.executable.unix.version}"/>
<not>
<!-- Zero length string for version.dev indicates a release build -->
<equals arg1="${version.dev}" arg2=""/>
@@ -2656,7 +2656,7 @@ To skip building the Windows installer, set the
skip.installer property in build
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 [${nsis.version}]
is required
+with version [${nsis.executable.unix.version}] but version [v${nsis.version}]
is required
for repeatable builds.
You may need a custom build of makensis. Instructions for this may be found in
BUILDING.txt"/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
