# HG changeset patch
# User Anirudha Bose <ani07nov@gmail.com>
# Date 1374706414 -19800
# Node ID 40ae138b38a693f1299af215d52ad3eb98dc5059
# Parent  8708b7d07795c7705df4277df8de233394778003
Removed checking of JRE locally

diff -r 8708b7d07795 -r 40ae138b38a6 makeinst-script.sh
--- a/makeinst-script.sh	Thu Jul 25 04:18:42 2013 +0530
+++ b/makeinst-script.sh	Thu Jul 25 04:23:34 2013 +0530
@@ -34,8 +34,6 @@
 !define INSTALLER_NAME "octave-installer.exe"
 !define MAIN_APP_EXE "octave.exe"
 !define INSTALL_TYPE "SetShellVarContext current"
-!define CLASSPATH ".;lib;lib\myJar"
-!define CLASS "org.me.myProgram"
 !define PRODUCT_ROOT_KEY "HKLM"
 !define PRODUCT_KEY "Software\Octave"
 
@@ -197,9 +195,8 @@
 ; Function to check Java Runtime Environment
 Function CheckJRE
 ;  looks in:
-;  1 - .\jre directory (JRE Installed with application)
-;  2 - JAVA_HOME environment variable
-;  3 - the registry
+;  1 - JAVA_HOME environment variable
+;  2 - the registry
 
   Push \$R0
   Push \$R1
@@ -209,21 +206,16 @@
   !define JAVAEXE "javaw.exe"
 
   ClearErrors
-  StrCpy \$R0 "\$EXEDIR\jre\bin\\\${JAVAEXE}"
-  IfFileExists \$R0 continue  ;; 1) found it locally
-  StrCpy \$R0 ""
-
-  ClearErrors
   ReadEnvStr \$R0 "JAVA_HOME"
   StrCpy \$R0 "\$R0\bin\\\${JAVAEXE}"
-  IfErrors 0 continue  ;; 2) found it in JAVA_HOME
+  IfErrors 0 continue  ;; 1) found it in JAVA_HOME
 
   ClearErrors
   ReadRegStr \$R1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
   ReadRegStr \$R0 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\\\$R1" "JavaHome"
   StrCpy \$R0 "\$R0\bin\\\${JAVAEXE}"
 
-  IfErrors 0 continue  ;; 3) found it in the registry
+  IfErrors 0 continue  ;; 2) found it in the registry
   IfErrors JRE_Error
 
  JRE_Error: