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 3997b43cc8 These targets have to be public so NSIS can call them
3997b43cc8 is described below
commit 3997b43cc8e172846ffbeed21cce0a5ceea006f1
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Feb 12 10:32:19 2025 +0000
These targets have to be public so NSIS can call them
---
build.xml | 4 ++--
res/install-win/tomcat.nsi | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/build.xml b/build.xml
index 8a22ce2d8a..6d362fd980 100644
--- a/build.xml
+++ b/build.xml
@@ -2672,7 +2672,7 @@ To skip building the Windows installer, set the
skip.installer property in build
</target>
<!-- Called via a callback in the NSIS installer script -->
- <target name="-jsign-installer"
+ <target name="jsign-installer"
depends="setup-jsign" if="${do.codesigning}" >
<echo>Signing ${tomcat.dist}/tomcat-installer.exe</echo>
<!-- Copy pre-existing detachced signature to signing directory -->
@@ -2695,7 +2695,7 @@ To skip building the Windows installer, set the
skip.installer property in build
</target>
<!-- Called via a callback in the NSIS installer script -->
- <target name="-jsign-uninstaller"
+ <target name="jsign-uninstaller"
depends="setup-jsign" if="${do.codesigning}" >
<echo>Signing ${codesigning.file_to_sign}</echo>
<!-- Copy pre-existing detachced signature to signing directory -->
diff --git a/res/install-win/tomcat.nsi b/res/install-win/tomcat.nsi
index 0d37e87ffb..ef318318d9 100644
--- a/res/install-win/tomcat.nsi
+++ b/res/install-win/tomcat.nsi
@@ -156,8 +156,8 @@ Var ServiceInstallLog
InstType Minimum
InstType Full
- !finalize 'ant -f @BASEDIR@/build.xml -jsign-installer'
- !uninstfinalize 'ant -f @BASEDIR@/build.xml -Dcodesigning.file_to_sign=%1
-jsign-uninstaller'
+ !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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
