This is an automated email from the ASF dual-hosted git repository.
rjung 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 2bbcb1fccd NSIS: Use "ReserveFile /plugin" instead of ReserveFile and
copying DLLs.
2bbcb1fccd is described below
commit 2bbcb1fccde518af8e3620772e584da2a0ba586b
Author: Rainer Jung <rainer.j...@kippdata.de>
AuthorDate: Thu Mar 6 23:05:56 2025 +0100
NSIS: Use "ReserveFile /plugin" instead of ReserveFile and copying DLLs.
Checked with 11.0.5 that it doesn't change the installer exe.
---
build.properties.default | 6 ------
build.xml | 5 -----
res/install-win/tomcat.nsi | 4 ++--
3 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 4018727881..ca8d7f5510 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -197,12 +197,6 @@ nsis.bin.checksum.algorithm=MD5|SHA-1
nsis.bin.checksum.value=e3e2803a13ead75e4471a51069d04c20|22cf776b463c6c845444328341219167abf399dc
nsis.bin.home=${base.path}/nsis-${nsis.version}
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
-nsis.nsisdl.dll=${nsis.bin.home}/Plugins/${nsis.arch.dir}NSISdl.dll
-nsis.system.dll=${nsis.bin.home}/Plugins/${nsis.arch.dir}System.dll
-nsis.nsdialogs.dll=${nsis.bin.home}/Plugins/${nsis.arch.dir}nsDialogs.dll
nsis.bin.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
nsis.src.checksum.algorithm=MD5|SHA-1
nsis.src.checksum.value=dec8094892b881f8bed0a170feee3200|d99f80a197653ad7a623a12f209853d68da1ab84
diff --git a/build.xml b/build.xml
index 836774a2a9..1fea2c637c 100644
--- a/build.xml
+++ b/build.xml
@@ -2687,11 +2687,6 @@ You may need a custom build of makensis. Instructions
for this may be found in B
<include name="*.xml"/>
</fileset>
</copy>
- <copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}"/>
- <copy file="${nsis.nsexec.dll}" todir="${tomcat.dist}"/>
- <copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}"/>
- <copy file="${nsis.system.dll}" todir="${tomcat.dist}"/>
- <copy file="${nsis.nsdialogs.dll}" todir="${tomcat.dist}"/>
<copy file="res/install-win/tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi"
overwrite="true" encoding="ISO-8859-1">
<filterset refid="version.filters"/>
<filterset refid="path.filters"/>
diff --git a/res/install-win/tomcat.nsi b/res/install-win/tomcat.nsi
index a82dacbeda..613330d8dc 100644
--- a/res/install-win/tomcat.nsi
+++ b/res/install-win/tomcat.nsi
@@ -160,8 +160,8 @@ Var ServiceInstallLog
!finalize 'ant -f @BASEDIR@/build.xml jsign-installer'
!uninstfinalize 'ant -f @BASEDIR@/build.xml -Dcodesigning.file_to_sign=%1
jsign-uninstaller'
- ReserveFile System.dll
- ReserveFile nsDialogs.dll
+ ReserveFile /plugin System.dll
+ ReserveFile /plugin nsDialogs.dll
ReserveFile tomcat-users_1.xml
ReserveFile tomcat-users_2.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
