more robust feature checks

Author: scivision

+stdlib/cpu_arch.m

@@ -3,7 +3,7 @@
 
 function a = cpu_arch()
 
-if NET.isNETSupported
+if stdlib.has_dotnet()
   a = System.Runtime.InteropServices.RuntimeInformation.OSArchitecture;
 else
   a = javaMethod("getProperty", "java.lang.System", "os.arch");

+stdlib/device.m

@@ -8,7 +8,7 @@
 
 i = [];
 
-if ispc()
+if ispc() && stdlib.has_dotnet()
   h = NET.addAssembly('System.Management');
 
   r = stdlib.root_name(path);

+stdlib/disk_available.m

@@ -13,9 +13,9 @@
 f = uint64(0);
 if ~stdlib.exists(d), return, end
 
-if NET.isNETSupported
+if stdlib.has_dotnet()
   f = System.IO.DriveInfo(stdlib.absolute(d)).AvailableFreeSpace();
-else
+elseif stdlib.has_java()
   f = javaMethod("getUsableSpace", "java.io.File", d);
   f = uint64(f);
 end

+stdlib/disk_capacity.m

@@ -11,9 +11,9 @@
 f = uint64(0);
 if ~stdlib.exists(d), return, end
 
-if NET.isNETSupported
+if stdlib.has_dotnet()
   f = System.IO.DriveInfo(stdlib.absolute(d)).TotalSize();
-else
+elseif stdlib.has_java()
   f = javaMethod("getTotalSpace", "java.io.File", d);
   f = uint64(f);
 end

+stdlib/filesystem_type.m

@@ -11,16 +11,18 @@
 t = "";
 if ~stdlib.exists(p), return, end
 
-if NET.isNETSupported
-  t = string(System.IO.DriveInfo(stdlib.absolute(p)).DriveFormat);
-else
+if stdlib.has_dotnet()
+  t = System.IO.DriveInfo(stdlib.absolute(p)).DriveFormat;
+elseif stdlib.has_java()
   op = javaPathObject(p);
 
-  if stdlib.isoctave()
-    t = javaMethod("getFileStore", "java.nio.file.Files", op).type;
-  else
-    t = java.nio.file.Files.getFileStore(op).type.string;
-  end
+  t = javaMethod("getFileStore", "java.nio.file.Files", op).type;
+end
+
+try  %#ok<*TRYNC>
+  t = string(t);
+end
+
 end
 
 %!assert(!isempty(filesystem_type(pwd)))

+stdlib/get_username.m

@@ -3,9 +3,11 @@
 %
 function n = get_username()
 
-if NET.isNETSupported
+n = '';
+
+if stdlib.has_dotnet()
   n = System.Environment.UserName;
-else
+elseif stdlib.has_java()
   n = javaMethod("getProperty", "java.lang.System", "user.name");
 end
 

+stdlib/has_java.m

@@ -1,5 +1,4 @@
 %% HAS_JAVA detect if JVM is available
-% requires: java
 
 function y = has_java()
 

+stdlib/hostname.m

@@ -6,12 +6,18 @@
 
 function n = hostname()
 
-if NET.isNETSupported
-  n = string(System.Environment.MachineName);
+n = '';
+
+if stdlib.has_dotnet()
+  n = System.Environment.MachineName;
 elseif stdlib.isoctave()
   n = gethostname();
-else
-  n = string(java.net.InetAddress.getLocalHost().getHostName());
+elseif stdlib.has_java()
+  n = java.net.InetAddress.getLocalHost().getHostName();
+end
+
+try  %#ok<*TRYNC>
+  n = string(n);
 end
 
 end

+stdlib/ram_total.m

@@ -9,13 +9,15 @@
 
 function bytes = ram_total()
 
+bytes = uint64(0);
+
 % .NET is about 10 times SLOWER than Java
-if ispc() && ~stdlib.has_java()
+if ispc() && ~stdlib.has_java() && stdlib.has_dotnet()
   h = NET.addAssembly('Microsoft.VisualBasic');
   ci = Microsoft.VisualBasic.Devices.ComputerInfo();
   bytes = ci.TotalPhysicalMemory;
   delete(h);
-else
+elseif stdlib.has_java()
   b = javaOSBean();
 
   if stdlib.java_api() < 14