Clean up initialization

Author: musm

src/MATLAB.jl

@@ -48,11 +48,15 @@ include("matstr.jl")
 
 function __init__()
 
-    # load libraries
+    # initialize library paths
+
+    lib_path = matlab_lib_path()
 
-    _libmx[] = Libdl.dlopen(joinpath(matlab_lib_path, "libmx"), Libdl.RTLD_GLOBAL)
-    _libmat[] = Libdl.dlopen(joinpath(matlab_lib_path, "libmat"), Libdl.RTLD_GLOBAL)
-    _libeng[] = Libdl.dlopen(joinpath(matlab_lib_path, "libeng"), Libdl.RTLD_GLOBAL)
+    # load libraries
+    
+    _libmx[]  = Libdl.dlopen(joinpath(lib_path, "libmx"), Libdl.RTLD_GLOBAL)
+    _libmat[] = Libdl.dlopen(joinpath(lib_path, "libmat"), Libdl.RTLD_GLOBAL)
+    _libeng[] = Libdl.dlopen(joinpath(lib_path, "libeng"), Libdl.RTLD_GLOBAL)
 
 
     # load functions to access mxArray

src/engine.jl

@@ -5,6 +5,7 @@
 #   Session open & close
 #
 ###########################################################
+const default_startcmd = matlab_startcmd() * " -nosplash"
 
 # 64 K buffer should be sufficient to store the output text in most cases
 const default_output_buffer_size = 64 * 1024
@@ -21,7 +22,6 @@ type MSession
         is_windows() && ccall(engfunc(:engSetVisible ), Cint, (Ptr{Void}, Cint), ep, 0)
 
         buf = Array(UInt8, bufsize)
-
         if bufsize > 0
             bufptr = pointer(buf)
             ccall(engfunc(:engOutputBuffer), Cint, (Ptr{Void}, Ptr{UInt8}, Cint),

src/mxbase.jl

@@ -1,9 +1,8 @@
 # Determine MATLAB library path and provide facilities to load libraries with
 # this path
 
-function get_paths()
+function matlab_home_path()
     matlab_home = get(ENV, "MATLAB_HOME", "")
-
     if matlab_home == ""
         if is_linux()
             matlab_home = dirname(dirname(realpath(chomp(readstring(`which matlab`)))))
@@ -12,38 +11,30 @@ function get_paths()
             if isdir(default_dir)
                 dirs = readdir(default_dir)
                 filter!(app -> ismatch(r"^MATLAB_R[0-9]+[ab]\.app$", dirs), dirs)
+                if ~isempty(dirs)
+                    matlab_home = joinpath(default_dir, maximum(dirs))
+                end
             end
         elseif is_windows()
             default_dir = Sys.WORD_SIZE == 32 ? "C:\\Program Files (x86)\\MATLAB" : "C:\\Program Files\\MATLAB"
             if isdir(default_dir)
                 dirs = readdir(default_dir)
                 filter!(dir -> ismatch(r"^R[0-9]+[ab]$", dir), dirs)
+                if ~isempty(dirs)
+                    matlab_home = joinpath(default_dir, maximum(dirs))
+                end
             end
         end
     end
-
-    if ~isempty(dirs)
-        matlab_home = joinpath(default_dir, maximum(dirs))
-    end
     if matlab_home == ""
         error("The MATLAB path could not be found. Set the MATLAB_HOME environmental variable to specify the MATLAB path.")
     end
+    return matlab_home
+end
 
-    if !is_windows()
-        default_startcmd = joinpath(matlab_home, "bin", "matlab")
-        if !isfile(default_startcmd)
-            error("The MATLAB path is invalid. Set the MATLAB_HOME evironmental variable to the MATLAB root.")
-        end
-        default_startcmd = "exec $(Base.shell_escape(default_startcmd))"
-    elseif is_windows()
-        default_startcmd = joinpath(matlab_home, "bin", (Sys.WORD_SIZE == 32 ? "win32" : "win64"), "MATLAB.exe")
-        if !isfile(default_startcmd)
-            error("The MATLAB path is invalid. Set the MATLAB_HOME evironmental variable to the MATLAB root.")
-        end
-    end
-    default_startcmd *= " -nosplash"
-
-    # Get path to MATLAB libraries
+function matlab_lib_path()
+    # get path to MATLAB libraries
+    matlab_home = matlab_home_path()
     matlab_lib_dir = if is_linux()
         Sys.WORD_SIZE == 32 ? "glnx86" : "glnxa64"
     elseif is_apple()
@@ -55,11 +46,25 @@ function get_paths()
     if !isdir(matlab_lib_path)
         error("The MATLAB library path could not be found.")
     end
-
-    return default_startcmd, matlab_lib_path
+    return matlab_lib_path
 end
 
-default_startcmd, matlab_lib_path = get_paths()
+function matlab_startcmd()
+    matlab_home = matlab_home_path()
+    if !is_windows()
+        default_startcmd = joinpath(matlab_home, "bin", "matlab")
+        if !isfile(default_startcmd)
+            error("The MATLAB path is invalid. Set the MATLAB_HOME evironmental variable to the MATLAB root.")
+        end
+        default_startcmd = "exec $(Base.shell_escape(default_startcmd))"
+    elseif is_windows()
+        default_startcmd = joinpath(matlab_home, "bin", (Sys.WORD_SIZE == 32 ? "win32" : "win64"), "MATLAB.exe")
+        if !isfile(default_startcmd)
+            error("The MATLAB path is invalid. Set the MATLAB_HOME evironmental variable to the MATLAB root.")
+        end
+    end
+    return default_startcmd
+end
 
 # helper library access function