remm 01/07/15 19:47:02
Modified: . tomcat.nsi
Log:
- Find the path to JavaHome in the registry instead of using an environment
variable.
- Will complain if no JDK is found.
Revision Changes Path
1.6 +19 -9 jakarta-tomcat-4.0/tomcat.nsi
Index: tomcat.nsi
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tomcat.nsi 2001/07/15 19:39:06 1.5
+++ tomcat.nsi 2001/07/16 02:47:02 1.6
@@ -1,6 +1,6 @@
; Tomcat 4 script for Nullsoft Installer
-; $Id: tomcat.nsi,v 1.5 2001/07/15 19:39:06 remm Exp $
+; $Id: tomcat.nsi,v 1.6 2001/07/16 02:47:02 remm Exp $
Name "jakarta-tomcat-4.0"
Caption "Jakarta Tomcat 4.0"
@@ -77,6 +77,9 @@
SectionIn 1 2 3
+ ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Development Kit" "CurrentVersion"
+ ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Development Kit\$1" "JavaHome"
+
SetOutPath "$SMPROGRAMS\Jakarta Tomcat 4.0"
CreateShortCut "$SMPROGRAMS\Jakarta Tomcat 4.0\Tomcat Home Page.lnk" \
@@ -89,13 +92,13 @@
"$INSTDIR"
CreateShortCut "$SMPROGRAMS\Jakarta Tomcat 4.0\Start Tomcat.lnk" \
- "%JAVA_HOME%\bin\java.exe" \
- '-cp "$INSTDIR\bin\bootstrap.jar;%JAVA_HOME%\lib\tools.jar"
-Dcatalina.home="$INSTDIR" org.apache.catalina.startup.Bootstrap start' \
+ "$2\bin\java.exe" \
+ '-cp "$INSTDIR\bin\bootstrap.jar;$2\lib\tools.jar"
-Dcatalina.home="$INSTDIR" org.apache.catalina.startup.Bootstrap start' \
"$INSTDIR\tomcat.ico" 0 SW_SHOWNORMAL
CreateShortCut "$SMPROGRAMS\Jakarta Tomcat 4.0\Stop Tomcat.lnk" \
- "%JAVA_HOME%\bin\java.exe" \
- '-cp "$INSTDIR\bin\bootstrap.jar;%JAVA_HOME%\lib\tools.jar"
-Dcatalina.home="$INSTDIR" org.apache.catalina.startup.Bootstrap stop' \
+ "$2\bin\java.exe" \
+ '-cp "$INSTDIR\bin\bootstrap.jar;$2\lib\tools.jar"
-Dcatalina.home="$INSTDIR" org.apache.catalina.startup.Bootstrap stop' \
"$INSTDIR\tomcat.ico" 0 SW_SHOWMINIMIZED
SetOutPath "$SMPROGRAMS\Jakarta Tomcat 4.0\Configuration"
@@ -189,12 +192,19 @@
SectionEnd
Function .onInit
+
+ ClearErrors
+
+ ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Development Kit" "CurrentVersion"
+ ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Development Kit\$1" "JavaHome"
+
+ IfErrors 0 NoAbort
+ MessageBox MB_OK "Couldn't find a Java Development Kit installed on this \
+computer. Please download one from http://java.sun.com.";
+ Abort
- MessageBox MB_YESNO|MB_ICONEXCLAMATION "If not done already, you need to set
the JAVA_HOME \
-environment variable and have it point to your JDK installation directory. \
-Answer No to quit the installer if your environment is not properly set." IDYES
NoAbort
- Abort ; causes installer to quit.
NoAbort:
+ MessageBox MB_OK "Using Java Development Kit version $1 found in $2"
FunctionEnd
