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
The following commit(s) were added to refs/heads/main by this push:
new 942ad16b45 Rename property
942ad16b45 is described below
commit 942ad16b4540a8435e330146631d4b99c6c9f195
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Mar 4 14:26:24 2025 +0000
Rename property
---
build.properties.default | 2 +-
build.xml | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index cf4d5c258e..0e75c2dec7 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -176,7 +176,7 @@ nsis.checksum.enabled=true
nsis.bin.checksum.algorithm=MD5|SHA-1
nsis.bin.checksum.value=e3e2803a13ead75e4471a51069d04c20|22cf776b463c6c845444328341219167abf399dc
nsis.bin.home=${base.path}/nsis-${nsis.version}
-nsis.exe=${nsis.bin.home}/makensis.exe
+nsis.executable.windows=${nsis.bin.home}/makensis.exe
nsis.arch.dir=x86-unicode/
nsis.installoptions.dll=${nsis.bin.home}/Plugins/${nsis.arch.dir}InstallOptions.dll
nsis.nsexec.dll=${nsis.bin.home}/Plugins/${nsis.arch.dir}nsExec.dll
diff --git a/build.xml b/build.xml
index b7a2a29071..f1e678760a 100644
--- a/build.xml
+++ b/build.xml
@@ -2679,7 +2679,7 @@ To skip building the Windows installer, set the
skip.installer property in build
<target name="-installer-wine" if="${wine.ok}">
<exec dir="${tomcat.dist}" executable="wine" osfamily="unix">
- <arg value="${nsis.exe}" />
+ <arg value="${nsis.executable.windows}" />
<arg value="/DNSISDIR=${nsis.bin.home}" />
<arg value="/V2" />
<arg value="tomcat.nsi" />
@@ -2696,7 +2696,7 @@ To skip building the Windows installer, set the
skip.installer property in build
<target name="-installer" unless="skip.installer"
depends="-installer-prep,-installer-wine,-installer-makensis">
- <exec dir="${tomcat.dist}" executable="${nsis.exe}" osfamily="windows">
+ <exec dir="${tomcat.dist}" executable="${nsis.executable.windows}"
osfamily="windows">
<arg value="/DNSISDIR=${nsis.bin.home}" />
<arg value="/V2" />
<arg value="tomcat.nsi" />
@@ -3613,7 +3613,7 @@ Configured for ${release.asfusername} to release Tomcat
${version.major}.${versi
<antcall target="downloadzip">
<param name="sourcefile" value="${nsis.bin.loc}"/>
- <param name="destfile" value="${nsis.exe}"/>
+ <param name="destfile" value="${nsis.executable.windows}"/>
<param name="destdir" value="${nsis.bin.home}/.."/>
<param name="checksum.enabled" value="${nsis.checksum.enabled}"/>
<param name="checksum.algorithm" value="${nsis.bin.checksum.algorithm}"/>
@@ -3622,7 +3622,7 @@ Configured for ${release.asfusername} to release Tomcat
${version.major}.${versi
<antcall target="downloadbz2">
<param name="sourcefile" value="${nsis.src.loc}"/>
- <param name="destfile" value="${nsis.exe}"/>
+ <param name="destfile" value="${nsis.executable.windows}"/>
<param name="destdir" value="${nsis.bin.home}/.."/>
<param name="checksum.enabled" value="${nsis.checksum.enabled}"/>
<param name="checksum.algorithm" value="${nsis.src.checksum.algorithm}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
