Author: markt
Date: Thu Oct 27 14:28:46 2016
New Revision: 1766834
URL: http://svn.apache.org/viewvc?rev=1766834&view=rev
Log:
Update to NSIS 3.0
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/res/tomcat.nsi
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1766834&r1=1766833&r2=1766834&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Oct 27 14:28:46 2016
@@ -126,13 +126,13 @@ tomcat-native.loc.2=${base-tomcat.loc.2}
tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
-# ----- NSIS, version 2.0 or later -----
-nsis.version=2.51
+# ----- NSIS, version 3.0 or later -----
+nsis.version=3.0
nsis.home=${base.path}/nsis-${nsis.version}
nsis.exe=${nsis.home}/makensis.exe
-nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
-nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
-nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
+nsis.installoptions.dll=${nsis.home}/Plugins/x86-unicode/InstallOptions.dll
+nsis.nsexec.dll=${nsis.home}/Plugins/x86-unicode/nsExec.dll
+nsis.nsisdl.dll=${nsis.home}/Plugins/x86-unicode/NSISdl.dll
nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
# ----- Commons Daemon, version 1.0-Alpha or later -----
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1766834&r1=1766833&r2=1766834&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Thu Oct 27 14:28:46 2016
@@ -158,8 +158,8 @@ Var ServiceInstallLog
InstType Minimum
InstType Full
- ReserveFile "${NSISDIR}\Plugins\System.dll"
- ReserveFile "${NSISDIR}\Plugins\nsDialogs.dll"
+ ReserveFile "${NSISDIR}\Plugins\x86-unicode\System.dll"
+ ReserveFile "${NSISDIR}\Plugins\x86-unicode\nsDialogs.dll"
ReserveFile confinstall\tomcat-users_1.xml
ReserveFile confinstall\tomcat-users_2.xml
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1766834&r1=1766833&r2=1766834&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 27 14:28:46 2016
@@ -171,6 +171,10 @@
Remove classes from tomcat-util-scan.jar that are duplicates of those
in
tomcat-util.jar. (markt)
</fix>
+ <add>
+ Update the NSIS Installer used to build the Windows installer to
version
+ 3.0. (markt)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
