remm 2003/12/26 09:31:54 Modified: . build.properties.default tomcat.nsi Log: - Update to HEAD (almost beta 5) of NSIS. Revision Changes Path 1.114 +3 -3 jakarta-tomcat-5/build.properties.default Index: build.properties.default =================================================================== RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- build.properties.default 5 Dec 2003 09:56:50 -0000 1.113 +++ build.properties.default 26 Dec 2003 17:31:54 -0000 1.114 @@ -187,10 +187,10 @@ # ----- NSIS, version 2.0 or later ----- -nsis.home=${base.path}/nsis-2.0-b3 +nsis.home=${base.path}/nsis-2.0-b4 nsis.exe=${nsis.home}/makensis.exe nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll -nsis.loc=http://telia.dl.sourceforge.net/sourceforge/nsis/nsis20b3.exe +nsis.loc=http://telia.dl.sourceforge.net/sourceforge/nsis/nsis20b4.exe # ----- Struts, version 1.1 or later ----- 1.39 +28 -41 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi =================================================================== RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- tomcat.nsi 25 Nov 2003 14:16:52 -0000 1.38 +++ tomcat.nsi 26 Dec 2003 17:31:54 -0000 1.39 @@ -5,34 +5,22 @@ ;Compression options CRCCheck on SetCompress force - SetCompressor bzip2 + SetCompressor lzma SetDatablockOptimize on !include "MUI.nsh" -!define MUI_PRODUCT "Apache Tomcat" -!define MUI_VERSION "@VERSION@" +Name "Apache Tomcat" ;-------------------------------- ;Configuration - !define MUI_WELCOMEPAGE - !define MUI_FINISHPAGE !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\webapps\ROOT\RELEASE-NOTES.txt" !define MUI_FINISHPAGE_RUN $INSTDIR\bin\tomcatw.exe !define MUI_FINISHPAGE_RUN_PARAMETERS //GT//Tomcat5 - !define MUI_FINISHPAGE_NOREBOOTSUPPORT - !define MUI_LICENSEPAGE - !define MUI_COMPONENTSPAGE - !define MUI_DIRECTORYPAGE - !define MUI_ABORTWARNING - !define MUI_CUSTOMPAGECOMMANDS - - !define MUI_UNINSTALLER - !define MUI_UNCONFIRMPAGE !define TEMP1 $R0 !define TEMP2 $R1 @@ -40,9 +28,6 @@ !define MUI_ICON tomcat.ico !define MUI_UNICON tomcat.ico - ;Language - !insertmacro MUI_LANGUAGE "English" - ;General OutFile tomcat-installer.exe @@ -55,15 +40,19 @@ LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} "Tomcat basic configuration." LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} ": Configuration Options" - ;Page order - !insertmacro MUI_PAGECOMMAND_WELCOME - !insertmacro MUI_PAGECOMMAND_LICENSE - !insertmacro MUI_PAGECOMMAND_COMPONENTS - !insertmacro MUI_PAGECOMMAND_DIRECTORY - Page custom SetConfiguration "$(TEXT_CONF_PAGETITLE)" - Page custom SetChooseJVM "$(TEXT_JVM_PAGETITLE)" - !insertmacro MUI_PAGECOMMAND_INSTFILES - !insertmacro MUI_PAGECOMMAND_FINISH + ;Install Page order + !insertmacro MUI_PAGE_WELCOME + !insertmacro MUI_PAGE_LICENSE INSTALLLICENSE + !insertmacro MUI_PAGE_COMPONENTS + !insertmacro MUI_PAGE_DIRECTORY + Page custom SetConfiguration Void "$(TEXT_CONF_PAGETITLE)" + Page custom SetChooseJVM Void "$(TEXT_JVM_PAGETITLE)" + !insertmacro MUI_PAGE_INSTFILES + !insertmacro MUI_PAGE_FINISH + + ;Uninstall Page order + !insertmacro MUI_UNPAGE_CONFIRM + !insertmacro MUI_UNPAGE_INSTFILES ;License dialog LicenseData INSTALLLICENSE @@ -78,6 +67,9 @@ LangString DESC_SecMenu ${LANG_ENGLISH} "Create a Start Menu program group for Tomcat." LangString DESC_SecExamples ${LANG_ENGLISH} "Installs some examples web applications." + ;Language + !insertmacro MUI_LANGUAGE English + ;Folder-select dialog InstallDir "$PROGRAMFILES\Apache Software Foundation\Tomcat 5.0" @@ -89,17 +81,11 @@ ; Main registry key InstallDirRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\5.0" "" - !insertmacro MUI_RESERVEFILE_WELCOMEFINISHPAGE !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS ReserveFile "jvm.ini" ReserveFile "config.ini" ;-------------------------------- -;Modern UI System - -!insertmacro MUI_SYSTEM - -;-------------------------------- ;Installer Sections SubSection "Tomcat" SecTomcat @@ -116,11 +102,11 @@ File /r bin File /r common File /r conf - File /r shared - File /r logs + File /nonfatal /r shared + File /nonfatal /r logs File /r server - File /r work - File /r temp + File /nonfatal /r work + File /nonfatal /r temp SetOutPath $INSTDIR\webapps File /r webapps\balancer File /r webapps\ROOT @@ -257,10 +243,13 @@ !insertmacro MUI_INSTALLOPTIONS_DISPLAY "config.ini" FunctionEnd +Function Void +FunctionEnd + ;-------------------------------- ;Descriptions -!insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN +!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcat} $(DESC_SecTomcat) !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatCore} $(DESC_SecTomcatCore) !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatService} $(DESC_SecTomcatService) @@ -268,7 +257,7 @@ !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatDocs} $(DESC_SecTomcatDocs) !insertmacro MUI_DESCRIPTION_TEXT ${SecMenu} $(DESC_SecMenu) !insertmacro MUI_DESCRIPTION_TEXT ${SecExamples} $(DESC_SecExamples) -!insertmacro MUI_FUNCTIONS_DESCRIPTION_END +!insertmacro MUI_FUNCTION_DESCRIPTION_END ; ===================== @@ -511,8 +500,6 @@ MessageBox MB_OK|MB_ICONEXCLAMATION \ "Note: $INSTDIR could not be removed." Removed: - - !insertmacro MUI_UNFINISHHEADER SectionEnd
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]