generalize

Author: scivision

+stdlib/matlab_git_version.m

@@ -1,6 +1,6 @@
 %% MATLAB_GIT_VERSION version of the Git2 library used by Matlab
-% general example of access shared library version info from Matlab
-% using loadlibrary() to call a function in a shared library without a MEX file.
+% version('-modules') doesn't reveal the version of Git2, so this function uses
+% loadlibrary() to call a function in the Git2 library without a MEX file.
 %
 % Input:
 %   libPath - Full path to the library (optional)
@@ -10,54 +10,13 @@
 
 function v = matlab_git_version(libPath)
 arguments
-  libPath {mustBeTextScalar, mustBeFile} = getMatlabGit2libPath()
+  libPath {mustBeTextScalar} = getMatlabGit2libPath()
 end
 
-if ispc()
-  % Windows .NET
-  fileInfo = System.Diagnostics.FileVersionInfo.GetVersionInfo(libPath);
-  v = char(fileInfo.FileVersion);
-else
-% elseif ismac()
-%   cmd = ['otool -L "' char(libPath) '"'];
-%   pat = '(?<=current version\s+)[0-9][0-9.]+';
-%   v = shell_regex(cmd, pat);
+v = library_version(libPath, fullfile(fileparts(mfilename("fullpath")), 'private/git2dummy.h'), 'git2');
 
-  cwd = fileparts(mfilename("fullpath"));
-  hdr = fullfile(cwd, 'private/git2dummy.h');
-
-  if ~libisloaded('git2')
-    if isfile(libPath)
-      loadlibrary(libPath, hdr, alias='git2');
-    else
-      v = missing;
-      return
-    end
-  end
-
-  maj = libpointer('int32Ptr', 0);
-  min = libpointer('int32Ptr', 0);
-  rev = libpointer('int32Ptr', 0);
-
-  calllib('git2', 'git_libgit2_version', maj, min, rev);
-  v = sprintf('%d.%d.%d', maj.Value, min.Value, rev.Value);
 end
 
-
-end
-
-% function v = shell_regex(cmd, pat)
-% [status, o] = system(cmd);
-% assert(status == 0, 'Failed to get library version from %s\nOutput: %s', cmd, o);
-%
-% v = regexp(o, pat, 'match', 'once');
-% if iscell(v)
-%   v = v{1};
-% end
-% v = char(strtrim(v));
-% end
-
-
 function p = getMatlabGit2libPath()
   archDir = fullfile(matlabroot, 'bin', computer('arch'));
 

+stdlib/private/library_version.m

@@ -0,0 +1,56 @@
+%% LIBRARY_VERSION get version of shared library
+% general example of access shared library version info from Matlab
+% using loadlibrary() to call a function in a shared library without a MEX file.
+%
+% Input:
+%   libPath - Full path to the library (optional)
+%
+% Output:
+%   v - version string (e.g., '1.9.0')
+
+function v = library_version(libPath, header, name)
+arguments
+  libPath {mustBeTextScalar, mustBeFile}
+  header {mustBeTextScalar, mustBeFile}
+  name {mustBeTextScalar}
+end
+
+
+if ispc()
+  % Windows .NET
+  fileInfo = System.Diagnostics.FileVersionInfo.GetVersionInfo(libPath);
+  v = char(fileInfo.FileVersion);
+else
+% elseif ismac()
+%   cmd = ['otool -L "' char(libPath) '"'];
+%   pat = '(?<=current version\s+)[0-9][0-9.]+';
+%   v = shell_regex(cmd, pat);
+
+  if ~libisloaded(name)
+    if isfile(libPath)
+      loadlibrary(libPath, header, alias=name);
+    else
+      v = missing;
+      return
+    end
+  end
+
+  switch name
+    case 'git2'
+      fun = 'git_libgit2_version';
+    otherwise
+      error('stdlib:library_version', 'Unknown library name: %s', name)
+  end
+
+  maj = libpointer('int32Ptr', 0);
+  min = libpointer('int32Ptr', 0);
+  rev = libpointer('int32Ptr', 0);
+
+  calllib(name, fun, maj, min, rev);
+  v = sprintf('%d.%d.%d', maj.Value, min.Value, rev.Value);
+
+  unloadlibrary(name)
+end
+
+
+end

scripts/installDotNet.m

@@ -15,12 +15,7 @@
 else
 
 if ~strlength(installDir)
-  if ispc()
-    installDir = getenv('USERPROFILE');
-  else
-    installDir = getenv('HOME');
-  end
-  installDir = fullfile(installDir, '.dotnet');
+  installDir = default_installdir();
 end
 if ~isfolder(installDir)
   mkdir(installDir);
@@ -32,9 +27,7 @@
 
 cmd = sprintf('sh -c "%s --install-dir %s"', scr, installDir);
 
-if isunix()
-  setPermissions(filePermissions(scr), "UserExecute", true);
-end
+setPermissions(filePermissions(scr), "UserExecute", true);
 
 end
 
@@ -64,3 +57,15 @@
 dotnetenv()
 
 end
+
+
+function d = default_installdir()
+
+if ispc()
+  h = getenv('USERPROFILE');
+else
+  h = getenv('HOME');
+end
+d = fullfile(h, '.dotnet');
+
+end