Merge pull request #1 from phsilva/add-osx-detection

Add support for OS X detection.

src/com/elphel/vdt/core/Utils.java

@@ -26,16 +26,17 @@
  *******************************************************************************/
 package com.elphel.vdt.core;
 
-import java.util.*;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-
-import com.elphel.vdt.ui.MessageUI;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+
+import com.elphel.vdt.ui.MessageUI;
 
 /**
  * Utilities for VDT Plud-in.
@@ -47,7 +48,9 @@ import com.elphel.vdt.ui.MessageUI;
 public class Utils {
 
     public static final int OS_WINDOWS = 1;
-    public static final int OS_LINUX = 2;
+    public static final int OS_LINUX = 2;
+	public static final int OS_MAC = 3;
+
     private static int os;
 
     public static boolean isWindows() {
@@ -56,8 +59,12 @@ public class Utils {
 
     public static boolean isLinux() {
         return os == OS_LINUX;
-    }
-    
+    }
+    
+	public static boolean isMac() {
+		return os == OS_MAC;
+	}
+
 	/** Returns the pure file name without path and extensions. */
 	public static String getPureFileName(String fileName) {
         if ((fileName == null) || (fileName.length() == 0))
@@ -138,7 +145,9 @@ public class Utils {
         if(osName.indexOf("Windows") >= 0)
             os = OS_WINDOWS;
         else if (osName.indexOf("Linux") >= 0)
-            os = OS_LINUX;
+            os = OS_LINUX;
+		else if (osName.contains("OS X"))
+			os = OS_MAC;
         else
             MessageUI.fatalError("Unknown os.name");
     }

src/com/elphel/vdt/core/tools/generators/OSNameGenerator.java

@@ -26,15 +26,16 @@
  *******************************************************************************/
 package com.elphel.vdt.core.tools.generators;
 
-import com.elphel.vdt.VDT;
-import com.elphel.vdt.ui.MessageUI;
+import com.elphel.vdt.VDT;
+import com.elphel.vdt.ui.MessageUI;
 
 
 public class OSNameGenerator extends AbstractGenerator {
     public static final String NAME = VDT.GENERATOR_ID_OS_NAME;
 
     private static final String OS_WINDOWS = "Windows";
-    private static final String OS_LINUX = "Linux";
+    private static final String OS_LINUX = "Linux";
+    private static final String OS_MAC = "Mac OS X";
     
     public String getName() {
         return NAME;
@@ -50,7 +51,9 @@ public class OSNameGenerator extends AbstractGenerator {
         if(osName.indexOf(OS_WINDOWS) >= 0) {
             return new String[] { OS_WINDOWS };
         } else if (osName.indexOf("Linux") >= 0) {
-            return new String[] { OS_LINUX };
+            return new String[] { OS_LINUX };
+		} else if (osName.contains("OS X")) {
+        	return new String[] { OS_MAC };
         } else {
             MessageUI.error("Generator '" + getName() + "' failure: OS '" + osName + "' is unknown");
             return null;

tools/Installation.xml

@@ -32,6 +32,7 @@
             <paramtype kind="enum" base="String">
                 <item value="Windows" />                            
                 <item value="Linux" />                            
+                <item value="Mac OS X" />                            
             </paramtype>
         </typedef>