Commit 83666e1b authored by Paulo Henrique Silva's avatar Paulo Henrique Silva
Browse files

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

Add support for OS X detection.
parents 1f6c2179 9c87838d

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

+23 −14
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ 
 *******************************************************************************/

package com.elphel.vdt.core;



import java.util.*;

import java.util.Iterator;

import java.util.List;



import org.eclipse.core.resources.IProject;

import org.eclipse.core.resources.IProjectDescription;
@@ -48,6 +49,8 @@ public class Utils { 


    public static final int OS_WINDOWS = 1;

    public static final int OS_LINUX = 2;

	public static final int OS_MAC = 3;



    private static int os;



    public static boolean isWindows() {
@@ -58,6 +61,10 @@ public class Utils { 
        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))
@@ -139,6 +146,8 @@ public class Utils { 
            os = OS_WINDOWS;

        else if (osName.indexOf("Linux") >= 0)

            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

+7 −4
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ public class OSNameGenerator extends AbstractGenerator { 


    private static final String OS_WINDOWS = "Windows";

    private static final String OS_LINUX = "Linux";

    private static final String OS_MAC = "Mac OS X";

    

    public String getName() {

        return NAME;
@@ -51,6 +52,8 @@ public class OSNameGenerator extends AbstractGenerator { 
            return new String[] { OS_WINDOWS };

        } else if (osName.indexOf("Linux") >= 0) {

            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

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
            <paramtype kind="enum" base="String">

                <item value="Windows" />                            

                <item value="Linux" />                            

                <item value="Mac OS X" />                            

            </paramtype>

        </typedef>