cvs commit: jakarta-tomcat-4.0 tomcat.nsi

[remm]

remm        01/09/06 20:50:03

  Modified:    .        tomcat.nsi
  Log:
  - Fixes problems with JDK 1.4 installing the NT service.
  - Also fix a bug where the service was incorrectly installed if the path to the JDK
    contained a path.
  - The installer now uses the JRE for everything, but still needs to copy tools.jar
    from the JDK.
  - Fixes bug 3445, reported by Dylan Schell <dylans at xs4all.nl>.
  
  Revision  Changes    Path
  1.14      +6 -6      jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- tomcat.nsi        2001/08/29 01:28:50     1.13
  +++ tomcat.nsi        2001/09/07 03:50:03     1.14
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.13 2001/08/29 01:28:50 remm Exp $
  +; $Id: tomcat.nsi,v 1.14 2001/09/07 03:50:03 remm Exp $
   
   Name "jakarta-tomcat-4.0"
   Caption "Jakarta Tomcat 4.0"
  @@ -63,13 +63,13 @@
   
     SectionIn 3
   
  -  ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Development Kit" "CurrentVersion"
  -  ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Development Kit\$1" "JavaHome"
  +  ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
  +  ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$1" "RuntimeLib"
     
     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" 
-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"'
  +  ExecWait '"$INSTDIR\bin\tomcat.exe" -install "Jakarta Tomcat" "$2" 
-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
   
  @@ -98,8 +98,8 @@
   
     SectionIn 1 2 3
   
  -  ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Development Kit" "CurrentVersion"
  -  ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Development Kit\$1" "JavaHome"
  +  ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
  +  ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$1" "JavaHome"
   
     SetOutPath "$SMPROGRAMS\Jakarta Tomcat 4.0"