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
The following commit(s) were added to refs/heads/10.1.x by this push:
new dc12817606 Support platform or custom makensis on unix/linux/etc
dc12817606 is described below
commit dc128176066ca15543076fe9c603f87448432ab1
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 4 14:53:44 2025 +0000
Support platform or custom makensis on unix/linux/etc
---
build.xml | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/build.xml b/build.xml
index fd7a94da7e..7422575690 100644
--- a/build.xml
+++ b/build.xml
@@ -2604,19 +2604,22 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
</and>
</or>
</condition>
- <condition property="makensis.ok">
- <or>
- <and>
- <equals arg1="${nsis.tool}" arg2="makensis" forcestring="true"/>
- <available file="makensis" filepath="${env.PATH}"/>
- </and>
- </or>
+ <condition property="nsis.executable.unix"
value="${nsis.bin.home}/Bin/makensis">
+ <available file="makensis" filepath="${nsis.bin.home}/Bin"/>
+ </condition>
+ <condition property="nsis.executable.unix" value="makensis">
+ <and>
+ <available file="makensis" filepath="${env.PATH}"/>
+ <not>
+ <available file="makensis" filepath="${nsis.bin.home}/Bin"/>
+ </not>
+ </and>
</condition>
<condition property="installer.ok">
<or>
<os family="windows"/>
<isset property="wine.ok"/>
- <isset property="makensis.ok"/>
+ <isset property="nsis.executable.unix"/>
<istrue value="${skip.installer}"/>
</or>
</condition>
@@ -2669,8 +2672,9 @@ To skip building the Windows installer, set the
skip.installer property in build
</exec>
</target>
- <target name="-installer-makensis" if="${makensis.ok}">
- <exec dir="${tomcat.dist}" executable="makensis" osfamily="unix">
+ <target name="-installer-makensis" if="nsis.executable.unix">
+ <echo message="Using makensis: ${nsis.executable.unix}"/>
+ <exec dir="${tomcat.dist}" executable="${nsis.executable.unix}"
osfamily="unix">
<arg value="-DNSISDIR=${nsis.bin.home}"/>
<arg value="-V2"/>
<arg value="tomcat.nsi"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
