(tomcat) 01/03: Fix version check

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 7a50b40e4fb94b6bc8ad367bd6d05f6e88416dbf
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 386c6fed06..d2be098bf0 100644
--- a/build.xml
+++ b/build.xml
@@ -2606,7 +2606,7 @@
     <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=""/>
@@ -2628,7 +2628,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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org