doctor json refinement

Author: scivision

+stdlib/doctor.m

@@ -4,21 +4,22 @@
 
 function json = doctor()
 
-raw = struct('matlab_arch', computer('arch'));
+raw = struct('matlab', []);
+raw.matlab.arch = computer('arch');
 
 if ~stdlib.isoctave()
   try
     r = matlabRelease().Release;
   catch
     r = ['R' version('-release')];
   end
-  raw.matlab_release = r;
+  raw.matlab.release = r;
 
   m = stdlib.matlab_bin_path();
-  raw.matlab_extern_bin = m.extern_bin;
-  raw.matlab_root = m.root;
-  raw.matlab_arch_bin = m.arch_bin;
-  raw.matlab_bin = m.bin;
+  raw.matlab.extern_bin = m.extern_bin;
+  raw.matlab.root = m.root;
+  raw.matlab.arch_bin = m.arch_bin;
+  raw.matlab.bin = m.bin;
 end
 
 h5v = stdlib.h5get_version();
@@ -32,27 +33,27 @@
 end
 
 if stdlib.has_java()
-  raw.java_vendor = stdlib.java_vendor();
-  raw.java_version = stdlib.java_version();
-  raw.java_home = stdlib.java_home();
+  raw.java.vendor = stdlib.java_vendor();
+  raw.java.version = stdlib.java_version();
+  raw.java.home = stdlib.java_home();
 end
 
 if stdlib.has_dotnet()
-  raw.dotnet_version = stdlib.dotnet_version();
+  raw.dotnet.version = stdlib.dotnet_version();
 end
 
 if stdlib.has_perl()
-  raw.perl_version = sprintf('%d.%d.%d', stdlib.perl_version());
-  raw.perl_exe = stdlib.perl_exe();
+  raw.perl.version = sprintf('%d.%d.%d', stdlib.perl_version());
+  raw.perl.exe = stdlib.perl_exe();
 end
 
 if stdlib.has_python()
-  raw.python_version = sprintf('%d.%d.%d', stdlib.python_version());
-  raw.python_home = stdlib.python_home();
+  raw.python.version = sprintf('%d.%d.%d', stdlib.python_version());
+  raw.python.home = stdlib.python_home();
 end
 
 if ismac()
-  raw.xcode_version = stdlib.xcode_version();
+  raw.xcode.version = stdlib.xcode_version();
 end
 
 if ~stdlib.isoctave()
@@ -61,19 +62,18 @@
 for i = 1:length(langs)
   lang = langs{i};
   co = mex.getCompilerConfigurations(lang);
-  ct = ['compiler_' lang];
-  vt = ['compiler_' lang '_version'];
-  raw.(ct) = '';
-  raw.(vt) = '';
+  raw.compiler.(lang).name = '';
+  raw.compiler.(lang).version = '';
 
   if ~isempty(co)
-    raw.(ct) = co.Name;
-    raw.(vt) = co.Version;
+    raw.compiler.(lang).name = co(1).Name;
+    raw.compiler.(lang).version = co(1).Version;
   end
 end
 
 end
 
+
 try
   json = jsonencode(raw, 'PrettyPrint', true);
 catch e

.gitattributes

@@ -1,5 +1,7 @@
 * text=auto
 
+*.oct binary
+
 *.fig binary
 *.mat binary
 *.mdl binary diff merge=mlAutoMerge

.gitignore

@@ -16,6 +16,7 @@ resources/
 
 *.mex*
 *.exe
+*.oct
 
 test/printenv
 test/stdout_stderr_c

Readme.md

@@ -62,3 +62,9 @@ For macOS, `brew install dotnet` and then in Matlab `edit(fullfile(userpath, 'st
 ## Acknowledgments
 
 Stdlib for Matlab was partly funded by NASA NNH19ZDA001N-HDEE grant 80NSSC20K0176.
+
+## Relevant Matlab / GNU Octave projects
+
+* [Matlab or GNU Octave HDF5 interface](https://www.mathworks.com/matlabcentral/fileexchange/180491-easyh5-a-tiny-hdf5-reader-writer-for-matlab-octave)
+* [GNU Octave hdf5oct package](https://gnu-octave.github.io/packages/hdf5oct/)
+* [GNU Octave netcdf package](https://gnu-octave.github.io/packages/netcdf/)

scripts/hdf5_version.cpp

@@ -0,0 +1,28 @@
+% build from GNU Octave with:
+%
+%   mkoctfile('hdf5_version.cpp', __octave_config_info__("HDF5_CPPFLAGS"), __octave_config_info__("HDF5_LDFLAGS"), __octave_config_info__("HDF5_LIBS"))
+%
+% then from GNU octave:
+%
+%   [maj, min, rel] = hdf5_version()
+%
+
+#include <octave/oct.h>
+#include <hdf5.h>
+
+DEFUN_DLD (hdf5_version, args, nargout,
+           "Return HDF5 library version as [major, minor, release]")
+{
+  unsigned maj = 0, min = 0, rel = 0;
+  herr_t status = H5get_libversion(&maj, &min, &rel);
+
+  if (status < 0)
+    error("H5get_libversion() failed");
+
+  octave_value_list retval;
+  retval(0) = octave_value(maj);
+  retval(1) = octave_value(min);
+  retval(2) = octave_value(rel);
+
+  return retval;
+}