remm 2003/02/17 05:05:11
Modified: . tomcat.nsi
Log:
- Makes procrun work.
- There's some unknown problem with Jasper, though (it apparently fails to
find the compiler).
Revision Changes Path
1.24 +14 -7 jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- tomcat.nsi 17 Feb 2003 07:43:42 -0000 1.23
+++ tomcat.nsi 17 Feb 2003 13:05:11 -0000 1.24
@@ -13,6 +13,9 @@
!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
@@ -129,6 +132,10 @@
Call configure
+ ExecWait '"$INSTDIR\bin\tomcatw.exe" //IS//Tomcat5 --DisplayName "Apache Tomcat
@VERSION@" --Description "Apache Tomcat @VERSION@ Server -
http://jakarta.apache.org/tomcat/"; --Install "$INSTDIR\bin\tomcat.exe" --ImagePath
"$INSTDIR\bin\bootstrap.jar" --StartupClass
org.apache.catalina.startup.Bootstrap;main;start --ShutdownClass
org.apache.catalina.startup.Bootstrap;main;stop --Java java --Startup manual'
+
+ ExecWait '"$INSTDIR\bin\tomcatw.exe" //US//Tomcat5 --JavaOptions
-Dcatalina.home="\"$INSTDIR\""#-Djava.endorsed.dirs="\"$INSTDIR\common\endorsed\""
--StdOutputFile "$INSTDIR\logs\stdout.log" --StdErrorFile "$INSTDIR\logs\stderr.log"
--WorkingPath "$INSTDIR"'
+
SectionEnd
Section "Service" SecTomcatService
@@ -140,7 +147,7 @@
Call findJVMPath
Pop $2
- ExecWait '"$INSTDIR\bin\tomcat.exe" //IS//Tomcat5 --DisplayName "Apache Tomcat
@VERSION@" --Description "Apache Tomcat @VERSION@ Server -
http://jakarta.apache.org/tomcat/"; --Install "$INSTDIR\bin\tomcat.exe" --ImagePath
"$INSTDIR\bin\bootstrap.jar" --StartupClass
org.apache.catalina.startup.Bootstrap;main;start --ShutdownClass
org.apache.catalina.startup.Bootstrap;main;stop --Java auto --JavaOptions
-Djava.endorsed.dirs="$INSTDIR\common\endorsed"#-Dcatalina.home="$INSTDIR"
--StdOutputFile "$INSTDIR\logs\stdout.log" --StdErrorFile "$INSTDIR\logs\stderr.log"
--WorkingPath "$INSTDIR"'
+ ExecWait '"$INSTDIR\bin\tomcatw.exe" //US//Tomcat5 --Startup auto'
BringToFront
ClearErrors
@@ -195,15 +202,15 @@
CreateShortCut "$SMPROGRAMS\Apache Tomcat 5.0\Tomcat 5.0 Program Directory.lnk" \
"$INSTDIR"
- CreateShortCut "$SMPROGRAMS\Apache Tomcat 5.0\Start Tomcat.lnk" \
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat 5.0\Start Tomcat (old).lnk" \
"$2\bin\java.exe" \
'-Duser.dir="$INSTDIR\bin" LauncherBootstrap -launchfile
catalina.xml catalina start' \
"$INSTDIR\tomcat.ico" 0 SW_SHOWNORMAL
- CreateShortCut "$SMPROGRAMS\Apache Tomcat 5.0\Stop Tomcat.lnk" \
- "$2\bin\java.exe" \
- '-Duser.dir="$INSTDIR\bin" LauncherBootstrap -launchfile
catalina.xml catalina stop' \
- "$INSTDIR\tomcat.ico" 0 SW_SHOWMINIMIZED
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat 5.0\Start Tomcat.lnk" \
+ "$INSTDIR\bin\tomcatw.exe" \
+ '//GT//Tomcat5' \
+ "$INSTDIR\tomcat.ico" 0 SW_SHOWNORMAL
SectionEnd
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
