mturk 2004/09/02 03:02:05 Modified: . Tag: TOMCAT_5_0 tomcat.nsi Log: Fix setting tmpdir. Add new side image and rtf license. Add tools.jar to classpath and do not copy tools.jar from SDK Revision Changes Path No revision No revision 1.45.2.1 +12 -6 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi =================================================================== RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.45 retrieving revision 1.45.2.1 diff -u -r1.45 -r1.45.2.1 --- tomcat.nsi 22 May 2004 20:43:35 -0000 1.45 +++ tomcat.nsi 2 Sep 2004 10:02:05 -0000 1.45.2.1 @@ -19,15 +19,18 @@ VIAddVersionKey ProductVersion "@VERSION@" VIAddVersionKey Comments "jakarta.apache.org/tomcat" VIAddVersionKey InternalName "[EMAIL PROTECTED]@.exe" - VIProductVersion @[EMAIL PROTECTED] + VIProductVersion @[EMAIL PROTECTED] !include "MUI.nsh" !include "StrFunc.nsh" + Var "JavaHome"
+ ${StrRep} ;-------------------------------- ;Configuration + !define MUI_WELCOMEFINISHPAGE_BITMAP side_left.bmp !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\webapps\ROOT\RELEASE-NOTES.txt" !define MUI_FINISHPAGE_RUN $INSTDIR\bin\tomcat5w.exe !define MUI_FINISHPAGE_RUN_PARAMETERS //MS//Tomcat5 @@ -68,7 +71,7 @@ !insertmacro MUI_UNPAGE_INSTFILES ;License dialog - LicenseData INSTALLLICENSE + LicenseData License.rtf ;Component-selection page ;Descriptions @@ -132,7 +135,7 @@ IfSilent +2 0 !insertmacro MUI_INSTALLOPTIONS_READ $2 "jvm.ini" "Field 2" "State" - CopyFiles /SILENT "$2\lib\tools.jar" "$INSTDIR\common\lib" 4500 +; CopyFiles /SILENT "$2\lib\tools.jar" "$INSTDIR\common\lib" 4500 ClearErrors Call configure @@ -142,6 +145,7 @@ IfSilent +2 0 !insertmacro MUI_INSTALLOPTIONS_READ $2 "jvm.ini" "Field 2" "State" + StrCpy "$JavaHome" $2 Push $2 Call findJVMPath Pop $2 @@ -164,6 +168,7 @@ IfSilent +2 0 !insertmacro MUI_INSTALLOPTIONS_READ $2 "jvm.ini" "Field 2" "State" + StrCpy "$JavaHome" $2 Push $2 Call findJVMPath Pop $2 @@ -247,8 +252,8 @@ SectionEnd Section -post - nsExec::ExecToLog '"$INSTDIR\bin\tomcat5.exe" //US//Tomcat5 --Classpath "$INSTDIR\bin\bootstrap.jar" --StartClass org.apache.catalina.startup.Bootstrap --StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop --StartMode jvm --StopMode jvm' - nsExec::ExecToLog '"$INSTDIR\bin\tomcat5.exe" //US//Tomcat5 --JvmOptions "-Dcatalina.home=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR" --StdOutput "$INSTDIR\logs\stdout.log" --StdError "$INSTDIR\logs\stderr.log"' + nsExec::ExecToLog '"$INSTDIR\bin\tomcat5.exe" //US//Tomcat5 --Classpath "$JavaHome\lib\tools.jar;$INSTDIR\bin\bootstrap.jar" --StartClass org.apache.catalina.startup.Bootstrap --StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop --StartMode jvm --StopMode jvm' + nsExec::ExecToLog '"$INSTDIR\bin\tomcat5.exe" //US//Tomcat5 --JvmOptions "-Dcatalina.home=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp" --StdOutput "$INSTDIR\logs\stdout.log" --StdError "$INSTDIR\logs\stderr.log"' WriteUninstaller "$INSTDIR\Uninstall.exe" @@ -396,6 +401,7 @@ MessageBox MB_OK "No Java Virtual Machine found." Quit NoErrors1: + StrCpy "$JavaHome" $3 Push $3 Call findJVMPath Pop $4 --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]