You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2012/01/15 06:54:00 UTC
svn commit: r1231630 - in /tomcat/trunk: build.xml res/License.rtf
res/tomcat.nsi
Author: kkolinko
Date: Sun Jan 15 05:53:59 2012
New Revision: 1231630
URL: http://svn.apache.org/viewvc?rev=1231630&view=rev
Log:
Remove res/License.rtf
The file that is actually shown by the Windows installer in res/INSTALLLICENSE. We do not need two license files here.
The MUI_PAGE_LICENSE macro in tomcat.nsi file actually creates its own LicenseData statement, though not a global one but scoped to PageEx directive. The global LicenseData statement is not needed, because we have no other license pages besides the one created by this macro.
For reference - see:
1) ${base.path}/nsis-2.46/Contrib/Modern UI 2/Pages/License.nsh
-> MUI_PAGE_LICENSE macro source code (line 50)
2) LicenseData + PageEx example in NSIS documentation,
"4.5.2 Page Options" http://nsis.sourceforge.net/Docs/Chapter4.html#4.5.2
"4.5.6 PageEx" http://nsis.sourceforge.net/Docs/Chapter4.html#4.5.6
Removed:
tomcat/trunk/res/License.rtf
Modified:
tomcat/trunk/build.xml
tomcat/trunk/res/tomcat.nsi
Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1231630&r1=1231629&r2=1231630&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sun Jan 15 05:53:59 2012
@@ -1687,7 +1687,6 @@ Apache Tomcat ${version} native binaries
<copy todir="${tomcat.dist}">
<fileset dir="res">
<include name="INSTALLLICENSE" />
- <include name="License.rtf" />
<include name="*.bmp" />
<include name="*.ico" />
<include name="confinstall/**" />
Modified: tomcat/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1231630&r1=1231629&r2=1231630&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Sun Jan 15 05:53:59 2012
@@ -117,6 +117,7 @@ Var ServiceInstallLog
;Install Page order
!insertmacro MUI_PAGE_WELCOME
+ ; Show file named "INSTALLLICENSE"
!insertmacro MUI_PAGE_LICENSE INSTALLLICENSE
; Use custom onLeave function with COMPONENTS page
!define MUI_PAGE_CUSTOMFUNCTION_LEAVE pageComponentsLeave
@@ -133,9 +134,6 @@ Var ServiceInstallLog
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
- ;License dialog
- LicenseData License.rtf
-
;Component-selection page
;Descriptions
LangString DESC_SecTomcat ${LANG_ENGLISH} "Install the Tomcat Servlet container as a Windows service."
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org