remm 02/01/31 17:12:26
Modified: . tomcat.nsi
Log:
- Attempt to support the IBM SDK in the installer, for setting up the NT service.
- Untested (I'm not even sure the IBM JDK is compatible with JavaService).
- Thanks to Henri Gomez for the info on the IBM JDK binary distribution.
Revision Changes Path
1.27 +12 -4 jakarta-tomcat-4.0/tomcat.nsi
Index: tomcat.nsi
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- tomcat.nsi 1 Feb 2002 00:14:54 -0000 1.26
+++ tomcat.nsi 1 Feb 2002 01:12:26 -0000 1.27
@@ -1,6 +1,6 @@
; Tomcat 4 script for Nullsoft Installer
-; $Id: tomcat.nsi,v 1.26 2002/02/01 00:14:54 remm Exp $
+; $Id: tomcat.nsi,v 1.27 2002/02/01 01:12:26 remm Exp $
Name "apache-tomcat-4.1"
Caption "Apache Tomcat 4.1"
@@ -270,11 +270,19 @@
Function findJVMPath
ReadEnvStr $1 JAVA_HOME
- IfFileExists $1\jre\bin\hotspot\jvm.dll 0 TryJDK14
- StrCpy $2 $1\jre\bin\hotspot\jvm.dll
+ IfFileExists "$1\jre\bin\hotspot\jvm.dll" 0 TryJDK14
+ StrCpy $2 "$1\jre\bin\hotspot\jvm.dll"
Goto EndIfFileExists
TryJDK14:
- StrCpy $2 $1\jre\bin\server\jvm.dll
+ IfFileExists "$1\jre\bin\server\jvm.dll" 0 TryClassic
+ StrCpy $2 "$1\jre\bin\server\jvm.dll"
+ Goto EndIfFileExists
+ TryClassic:
+ IfFileExists "$1\jre\bin\classic\jvm.dll" 0 JDKNotFound
+ StrCpy $2 "$1\jre\bin\classic\jvm.dll"
+ Goto EndIfFileExists
+ JDKNotFound:
+ SetErrors
EndIfFileExists:
IfErrors 0 FoundJVMPath
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
