JRE 8 embedded in Mac OS X binary versions 97/16897/2
Vincent COUVERT [Mon, 27 Jul 2015 09:07:30 +0000 (11:07 +0200)]
Change-Id: Icafcbfa027e45f92e474bc74d7192bfa5bf1b836

scilab/bin/scilab

index f9aa284..e1434b1 100755 (executable)
@@ -326,7 +326,12 @@ set_embedded_java_vm () {
                 esac
                 ;;
             *darwin* | *Darwin*) # MacOS X
-                set_macosx_java_vm
+                # JRE is now embedded in Mac OS X binary version
+                #set_macosx_java_vm
+                JAVA_HOME=$SCIBINARYBASE/thirdparty/java/Contents/Home/
+                JAVA_JVM_VERSION=$JAVA_HOME
+                export JAVA_JVM_VERSION
+                DYLD_LIBRARY_PATH="$JAVA_HOME/lib${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}"
                 ;;
             *)
             echo "Could not find the Java configuration for the OS <${OS}>. Please contact us or submit a bug report with your detailed configuration http://bugzilla.scilab.org/"