You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2017/03/09 10:04:23 UTC
svn commit: r1786123 - in /tomcat/trunk: build.properties.default build.xml
res/tomcat.nsi
Author: markt
Date: Thu Mar 9 10:04:23 2017
New Revision: 1786123
URL: http://svn.apache.org/viewvc?rev=1786123&view=rev
Log:
First attempt at re-working NSIS so the installer builds on Windows and Linux with 2.x and 3.x NSIS binaries (and appropriate properties)
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
tomcat/trunk/res/tomcat.nsi
Modified: tomcat/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1786123&r1=1786122&r2=1786123&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Mar 9 10:04:23 2017
@@ -139,6 +139,8 @@ nsis.exe=${nsis.home}/makensis.exe
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.system.dll=${nsis.home}/Plugins/x86-unicode/System.dll
+nsis.nsdialogs.dll=${nsis.home}/Plugins/x86-unicode/nsDialogs.dll.dll
nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
# ----- Commons Daemon, version 1.0-Alpha or later -----
Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1786123&r1=1786122&r2=1786123&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Mar 9 10:04:23 2017
@@ -2012,6 +2012,8 @@ skip.installer property in build.propert
<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/tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi" overwrite="true" encoding="ISO-8859-1">
<filterset refid="version.filters"/>
</copy>
Modified: tomcat/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1786123&r1=1786122&r2=1786123&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Thu Mar 9 10:04:23 2017
@@ -157,8 +157,8 @@ Var ServiceInstallLog
InstType Minimum
InstType Full
- ReserveFile "${NSISDIR}\Plugins\x86-unicode\System.dll"
- ReserveFile "${NSISDIR}\Plugins\x86-unicode\nsDialogs.dll"
+ ReserveFile System.dll
+ ReserveFile nsDialogs.dll
ReserveFile confinstall\tomcat-users_1.xml
ReserveFile confinstall\tomcat-users_2.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org