cvs commit: jakarta-tomcat-4.0 tomcat.nsi

[remm]

remm        01/08/28 18:28:50

  Modified:    .        tomcat.nsi
  Log:
  - Use user.dir property to specify the Catalina path, instead of catalina.home.
  
  Revision  Changes    Path
  1.13      +4 -4      jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- tomcat.nsi        2001/07/18 23:14:03     1.12
  +++ tomcat.nsi        2001/08/29 01:28:50     1.13
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.12 2001/07/18 23:14:03 remm Exp $
  +; $Id: tomcat.nsi,v 1.13 2001/08/29 01:28:50 remm Exp $
   
   Name "jakarta-tomcat-4.0"
   Caption "Jakarta Tomcat 4.0"
  @@ -69,7 +69,7 @@
     SetOutPath $INSTDIR\bin
     File /oname=tomcat.exe bin\tomcat.exe
     
  -  ExecWait '"$INSTDIR\bin\tomcat.exe" -install "Jakarta Tomcat" 
$2\jre\bin\hotspot\jvm.dll -Djava.class.path="$INSTDIR\bin\bootstrap.jar" 
-Dcatalina.home="$INSTDIR" -start org.apache.catalina.startup.BootstrapService -params 
start -stop org.apache.catalina.startup.BootstrapService -params stop -out 
"$INSTDIR\logs\stdout.log" -err "$INSTDIR\logs\stderr.log"'
  +  ExecWait '"$INSTDIR\bin\tomcat.exe" -install "Jakarta Tomcat" 
$2\jre\bin\hotspot\jvm.dll -Djava.class.path="$INSTDIR\bin\bootstrap.jar" 
-Duser.dir="$INSTDIR" -start org.apache.catalina.startup.BootstrapService -params 
start -stop org.apache.catalina.startup.BootstrapService -params stop -out 
"$INSTDIR\logs\stdout.log" -err "$INSTDIR\logs\stderr.log"'
     
     ClearErrors
   
  @@ -114,12 +114,12 @@
   
     CreateShortCut "$SMPROGRAMS\Jakarta Tomcat 4.0\Start Tomcat.lnk" \
                    "$2\bin\java.exe" \
  -                 '-jar -Dcatalina.home="$INSTDIR" "$INSTDIR\bin\bootstrap.jar" 
start' \
  +                 '-jar -Duser.dir="$INSTDIR" "$INSTDIR\bin\bootstrap.jar" start' \
                    "$INSTDIR\tomcat.ico" 0 SW_SHOWNORMAL
   
     CreateShortCut "$SMPROGRAMS\Jakarta Tomcat 4.0\Stop Tomcat.lnk" \
                    "$2\bin\java.exe" \
  -                 '-jar -Dcatalina.home="$INSTDIR" "$INSTDIR\bin\bootstrap.jar" 
stop' \
  +                 '-jar -Duser.dir="$INSTDIR" "$INSTDIR\bin\bootstrap.jar" stop' \
                    "$INSTDIR\tomcat.ico" 0 SW_SHOWMINIMIZED
   
     SetOutPath "$SMPROGRAMS\Jakarta Tomcat 4.0\Configuration"