Mercurial > hg > mxe-octave-anirudha

changeset 3179:13fb1dd39250

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
makeinst-script.sh: Removed checking of JRE locally
author Anirudha Bose <ani07nov@gmail.com>
date Thu, 25 Jul 2013 04:36:20 +0530
parents d202f8eb8c2f
children 2630c4da09fd
files makeinst-script.sh
diffstat 1 files changed, 4 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/makeinst-script.sh
+++ b/makeinst-script.sh
@@ -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"
 
@@ -196,9 +194,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
@@ -208,21 +205,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: