To make zero work under windows

Author: jantje

it.baeyens.arduino.common/src/it/baeyens/arduino/common/ArduinoConst.java

@@ -9,7 +9,7 @@
 public class ArduinoConst {
     // General stuff
     public static final String PluginStart = "it.baeyens."; //$NON-NLS-1$
-    public static final String CORE_PLUGIN_ID = PluginStart + "core"; //$NON-NLS-1$
+    public static final String CORE_PLUGIN_ID = PluginStart + "arduino.core"; //$NON-NLS-1$
 
     // prefix to be added to the arduino environment
     protected static final String UploadPortPrefix_WIN = "-P\\\\.\\"; //$NON-NLS-1$

it.baeyens.arduino.core/build.properties

@@ -11,7 +11,8 @@ bin.includes = .,\
                OSGI-INF/,\
                OSGI-INF/l10n/bundle.properties,\
                lib/jsch-0.1.50.jar,\
-               lib/jmdns-3.4.1.jar
+               lib/jmdns-3.4.1.jar,\
+               config/
 src.includes = icons/,\
                bin/
 jars.compile.order = .,\

it.baeyens.arduino.core/config/arduino_eclipse_plugin.txt

@@ -0,0 +1,7 @@
+#for the zero to be able to compile
+arduino_zero_edbg.build.usb_product.windows=\"Arduino Zero\"
+arduino_zero_edbg.build.usb_manufacturer.windows=\"Arduino LLC\"
+arduino_zero_edbg.build.usb_flags.windows=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSBCON "-DUSB_MANUFACTURER={build.usb_manufacturer}" "-DUSB_PRODUCT={build.usb_product}"
+arduino_zero_native.build.usb_product.windows=\"Arduino Zero\"
+arduino_zero_native.build.usb_manufacturer.windows=\"Arduino LLC\"
+arduino_zero_native.build.usb_flags.windows=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSBCON "-DUSB_MANUFACTURER={build.usb_manufacturer}" "-DUSB_PRODUCT={build.usb_product}"

it.baeyens.arduino.core/src/it/baeyens/arduino/tools/ArduinoHelpers.java

@@ -13,6 +13,8 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -54,6 +56,7 @@
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -64,6 +67,7 @@
 import org.eclipse.ui.console.IConsole;
 import org.eclipse.ui.console.IConsoleManager;
 import org.eclipse.ui.console.MessageConsole;
+import org.osgi.framework.Bundle;
 
 /**
  * ArduinoHelpers is a static class containing general purpose functions
@@ -739,11 +743,16 @@ private static boolean isThisMenuItemSelected(ArduinoBoards boardsFile, ICConfig
     }
 
     /**
-     * This method creates environment variables based on the platform.txt and boards.txt platform.txt is processed first and then boards.txt. This
+     * This method creates environment variables based on the platform.txt and boards.txt. platform.txt is processed first and then boards.txt. This
      * way boards.txt settings can overwrite common settings in platform.txt The environment variables are only valid for the project given as
      * parameter The project properties are used to identify the boards.txt and platform.txt as well as the board id to select the settings in the
      * board.txt file At the end also the path variable is set
      * 
+     * from arduino IDE 1.6.5 an additional file generated by the arduino ide is processed. This is the first file processed.
+     * 
+     * To be able to quickly fix boards.txt and pmatform.txt problems I also added a arduino_eclipse_plugin.txt that is processed as a boards.txt file
+     * and is processed after the arduino delivered boards.txt file.
+     * 
      * @param project
      *            the project for which the environment variables are set
      * @param arduinoProperties
@@ -759,16 +768,18 @@ public static void setTheEnvironmentVariables(IProject project, ICConfigurationD
 		ArduinoInstancePreferences.getLastUsedBoardsFile()));
 	IPath localPlatformFilename = new Path(Common.getBuildEnvironmentVariable(confDesc, ArduinoConst.ENV_KEY_JANTJE_PLATFORM_FILE, ""));
 
-	// if (!platformFilename.toFile().exists()) {
-	// for (int cursegment = 0; cursegment < platformFilename.segmentCount(); cursegment++) {
-	// if (ARDUINO_HARDWARE_FOLDER_NAME.equals(platformFilename.segment(cursegment))) {
-	//
-	// platformFilename = getArduinoPath().append(ARDUINO_HARDWARE_FOLDER_NAME).append("arduino")
-	// .append(platformFilename.removeFirstSegments(cursegment + 2));
-	// cursegment = platformFilename.segmentCount();
-	// }
-	// }
-	// }
+	Bundle bundle = Platform.getBundle(ArduinoConst.CORE_PLUGIN_ID);
+	URL fileURL = bundle.getEntry("config/arduino_eclipse_plugin.txt");
+	File file = null;
+	try {
+	    file = new File(FileLocator.resolve(fileURL).toURI());
+	} catch (URISyntaxException e1) {
+	    e1.printStackTrace();
+	} catch (IOException e1) {
+	    e1.printStackTrace();
+	}
+
+	IPath arduinoEclipsePluginFile = new Path(file.getAbsolutePath());
 
 	String boardID = Common.getBuildEnvironmentVariable(confDesc, ArduinoConst.ENV_KEY_JANTJE_BOARD_ID, "");
 	String architecture = Common.getBuildEnvironmentVariable(confDesc, ArduinoConst.ENV_KEY_JANTJE_ARCITECTURE_ID, "");
@@ -808,6 +819,13 @@ public static void setTheEnvironmentVariables(IProject project, ICConfigurationD
 	}
 	// now process the boards file
 	setTheEnvironmentVariablesAddtheBoardsTxt(contribEnv, confDesc, boardsFile, boardID);
+
+	// also process the file as part of the plugin
+	if (arduinoEclipsePluginFile.toFile().exists()) {
+	    ArduinoBoards myBoardsFile = new ArduinoBoards(arduinoEclipsePluginFile.toOSString());
+	    setTheEnvironmentVariablesAddtheBoardsTxt(contribEnv, confDesc, myBoardsFile, boardID);
+	}
+
 	// Do some post processing
 	setTheEnvironmentVariablesPostProcessing(contribEnv, confDesc);