Configure for MacOS: enable High Sierra (10.13) 44/19444/5
Paul Bignier [Mon, 2 Oct 2017 19:08:33 +0000 (12:08 -0700)]
 * Replaced "Mac OS X" with "macOS" (which it is since Sierra)
 * Forced 10.13 to use its own dependencies

Change-Id: Ic80dd5e342450c1c6f12fe6a5a8ab231aa13e0c0

scilab/bin/scilab
scilab/configure
scilab/m4/macosx.m4

index 361ffeb..0320791 100755 (executable)
@@ -733,6 +733,7 @@ detect_macosx_version()
 set_macox_specific_path()
 {
 
+    PATH_TO_SPECIFIC_10_13=$SCIBINARYBASE/lib/thirdparty/10.13/
     PATH_TO_SPECIFIC_10_12=$SCIBINARYBASE/lib/thirdparty/10.12/
     PATH_TO_SPECIFIC_10_11=$SCIBINARYBASE/lib/thirdparty/10.11/
     PATH_TO_SPECIFIC_10_10=$SCIBINARYBASE/lib/thirdparty/10.10/
@@ -741,13 +742,18 @@ set_macox_specific_path()
     case $macosxMajorVersion in
         10)
             case $macosxMinorVersion in
+                13)
+                    # Specific libBLAS.dylib & libz versions for 10.13
+                    LD_LIBRARY_PATH=$PATH_TO_SPECIFIC_10_13${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
+                    DYLD_LIBRARY_PATH=$PATH_TO_SPECIFIC_10_13${DYLD_LIBRARY_PATH+:$DYLD_LIBRARY_PATH}
+                    ;;
                 12)
-                    # not used yet
+                    # Specific libBLAS.dylib version for 10.12
                     LD_LIBRARY_PATH=$PATH_TO_SPECIFIC_10_12${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
                     DYLD_LIBRARY_PATH=$PATH_TO_SPECIFIC_10_12${DYLD_LIBRARY_PATH+:$DYLD_LIBRARY_PATH}
                     ;;
                 11)
-                    # not used yet
+                    # Specific libBLAS.dylib & libLAPACK.dylib version for 10.11
                     LD_LIBRARY_PATH=$PATH_TO_SPECIFIC_10_11${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
                     DYLD_LIBRARY_PATH=$PATH_TO_SPECIFIC_10_11${DYLD_LIBRARY_PATH+:$DYLD_LIBRARY_PATH}
                     ;;
@@ -761,6 +767,9 @@ set_macox_specific_path()
                     LD_LIBRARY_PATH=$PATH_TO_SPECIFIC_10_6${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
                     DYLD_LIBRARY_PATH=$PATH_TO_SPECIFIC_10_6${DYLD_LIBRARY_PATH+:$DYLD_LIBRARY_PATH}
                     ;;
+                *)
+                    fail_macosx_version
+                    ;;
             esac
             ;;
     esac
@@ -775,9 +784,9 @@ dialog_try_or_exit()
     osascript $BINPATH/checkmacosx.applescript "$1" || exit 128
 }
 
-fail_macosx_too_old()
+fail_macosx_version()
 {
-    dialog_try_or_exit "This version of Scilab will probably fail on this system ($macosxVersion): Scilab requires 10.8.3 (Mountain Lion) or newer system."
+    dialog_try_or_exit "This version of Scilab may fail on this system ($macosxVersion): Scilab is currently supported from 10.8.3 (Mountain Lion) to 10.13 (High Sierra)."
 }
 check_macosx_version()
 {
@@ -788,23 +797,23 @@ check_macosx_version()
                    # We force to install JRE on Mavericks
                    /usr/libexec/java_home --request > /dev/null
                    ;;
-                10|11|12)
-                   # ... but not on Yosemite, El Capitan or Sierra:
+                10|11|12|13)
+                   # ... but not on Yosemite, El Capitan, Sierra or High Sierra:
                    # there will be a (better) error at launch
                    ;;
                 8)
                     if test $macosxBuildVersion -le 3; then
                         # Version <= 10.8.3
-                        fail_macosx_too_old
+                        fail_macosx_version
                     fi
                     ;;
                 *)
-                    fail_macosx_too_old
+                    fail_macosx_version
                     ;;
             esac
             ;;
         *)
-            fail_macosx_too_old
+            fail_macosx_version
             ;;
     esac
 }
index fe0bbc9..e563ae5 100755 (executable)
@@ -6571,9 +6571,13 @@ case "$host_os" in
 $as_echo_n "checking Mac OS X Version... " >&6; }
     macosx_version=`sw_vers -productVersion`
     case $macosx_version in
+         10.13*)
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: macOS 10.13 - High Sierra." >&5
+$as_echo "macOS 10.13 - High Sierra." >&6; }
+         ;;
          10.12*)
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: Mac OS X 10.12 - Sierra." >&5
-$as_echo "Mac OS X 10.12 - Sierra." >&6; }
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: macOS 10.12 - Sierra." >&5
+$as_echo "macOS 10.12 - Sierra." >&6; }
          ;;
          10.11*)
               { $as_echo "$as_me:${as_lineno-$LINENO}: result: Mac OS X 10.11 - El Capitan." >&5
index 6adbca3..80f1e09 100644 (file)
@@ -5,8 +5,11 @@ AC_DEFUN([AC_GET_MACOSX_VERSION],[
     AC_MSG_CHECKING([Mac OS X Version])
     [macosx_version=`sw_vers -productVersion`]
     case $macosx_version in
+         10.13*)
+              AC_MSG_RESULT([macOS 10.13 - High Sierra.])
+         ;;
          10.12*)
-              AC_MSG_RESULT([Mac OS X 10.12 - Sierra.])
+              AC_MSG_RESULT([macOS 10.12 - Sierra.])
          ;;
          10.11*)
               AC_MSG_RESULT([Mac OS X 10.11 - El Capitan.])
@@ -21,7 +24,7 @@ AC_DEFUN([AC_GET_MACOSX_VERSION],[
               AC_MSG_RESULT([Mac OS X $macosx_version - Mountain Lion.])
          ;;
          *)
-              AC_MSG_ERROR([MacOSX 10.8.3 to 10.10 are needed. Found $macosx_version])
+              AC_MSG_ERROR([MacOSX 10.8.3 to 10.13 are needed. Found $macosx_version])
          ;;
     esac
 ])