remm 2002/11/14 02:36:39
Modified: . tomcat.nsi
Log:
- Update to nightly (again). On the plus side, the result is getting really
polished now (and much faster than usual MSI based installers).
Revision Changes Path
1.16 +12 -24 jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- tomcat.nsi 12 Nov 2002 08:02:24 -0000 1.15
+++ tomcat.nsi 14 Nov 2002 10:36:39 -0000 1.16
@@ -37,12 +37,21 @@
SetCompressor bzip2
SetDatablockOptimize on
+ ;Install Options pages
+ LangString TEXT_JVM_TITLE ${LANG_ENGLISH} "Java Virtual Machine"
+ LangString TEXT_JVM_SUBTITLE ${LANG_ENGLISH} "Java Virtual Machine path
selection."
+ LangString TEXT_JVM_PAGETITLE ${LANG_ENGLISH} ": Java Virtual Machine path
selection"
+
+ LangString TEXT_CONF_TITLE ${LANG_ENGLISH} "Configuration"
+ LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} "Tomcat basic configuration."
+ LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} ": Configuration Options"
+
;Page order
!insertmacro MUI_PAGECOMMAND_LICENSE
!insertmacro MUI_PAGECOMMAND_COMPONENTS
!insertmacro MUI_PAGECOMMAND_DIRECTORY
- Page custom SetConfiguration
- Page custom SetChooseJVM
+ Page custom SetConfiguration "$(TEXT_CONF_PAGETITLE)"
+ Page custom SetChooseJVM "$(TEXT_JVM_PAGETITLE)"
!insertmacro MUI_PAGECOMMAND_INSTFILES
;License dialog
@@ -61,15 +70,6 @@
;Folder-select dialog
InstallDir "$PROGRAMFILES\Apache Group\Tomcat 5.0"
- ;Install Options pages
- LangString TEXT_JVM_TITLE ${LANG_ENGLISH} "Java Virtual Machine"
- LangString TEXT_JVM_SUBTITLE ${LANG_ENGLISH} "Java Virtual Machine path
selection."
- LangString TEXT_JVM_PAGETITLE ${LANG_ENGLISH} "Java Virtual Machine path
selection"
-
- LangString TEXT_CONF_TITLE ${LANG_ENGLISH} "Configuration"
- LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} "Tomcat basic configuration."
- LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} "Tomcat 5 Configuration Options"
-
;Install types
InstType Normal
InstType Minimum
@@ -231,22 +231,16 @@
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache
Tomcat 5.0" \
"UninstallString" '"$INSTDIR\Uninstall.exe"'
- Sleep 500
BringToFront
SectionEnd
-
Function .onInit
;Extract Install Options INI Files
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "config.ini"
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "jvm.ini"
- ;Titles for Install Options dialogs
- !insertmacro MUI_INSTALLOPTIONS_WRITETITLE "config.ini" "$(TEXT_CONF_PAGETITLE)"
- !insertmacro MUI_INSTALLOPTIONS_WRITETITLE "jvm.ini" "$(TEXT_JVM_PAGETITLE)"
-
FunctionEnd
Function SetChooseJVM
@@ -260,12 +254,6 @@
Function SetConfiguration
!insertmacro MUI_HEADER_TEXT "$(TEXT_CONF_TITLE)" "$(TEXT_CONF_SUBTITLE)"
!insertmacro MUI_INSTALLOPTIONS_DISPLAY "config.ini"
-FunctionEnd
-
-Function .onInstSuccess
-
- ExecShell open '$SMPROGRAMS\Apache Tomcat 5.0'
-
FunctionEnd
;--------------------------------
--
To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@;jakarta.apache.org>
