fix for #arduino/Arduino/2982

When selecting the arduino in the preference page a file is made in the root of the workspace based on the command provided by arduino
When creatig/modifying a project this file is parced after the defaults.

Author: jantje

it.baeyens.arduino.common/META-INF/MANIFEST.MF

@@ -8,7 +8,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.jface.text,
  org.eclipse.ui.console,
- org.eclipse.cdt;bundle-version="8.5.0"
+ org.eclipse.cdt;bundle-version="8.5.0",
+ org.eclipse.osgi
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: it.baeyens.arduino.arduino,

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

@@ -36,11 +36,16 @@ public boolean belongsTo(Object family) {
  */
 public class Activator extends AbstractUIPlugin {
 
+    private static Activator instance;
+
+    public static Activator getDefault() {
+	return instance;
+    }
+
     // The plug-in ID
     public static final String PLUGIN_ID = "it.baeyens.arduino.common"; //$NON-NLS-1$
 
     // The shared instance
-    private static Activator plugin;
     private static final String flagStart = "F" + "s" + "S" + "t" + "a" + "t" + "u" + "s";
     private static final String flagMonitor = "F" + "m" + "S" + "t" + "a" + "t" + "u" + "s";
     private static final String uploadflag = "F" + "u" + "S" + "t" + "a" + "t" + "u" + "s";
@@ -63,7 +68,7 @@ public Activator() {
     @Override
     public void start(BundleContext context) throws Exception {
 	super.start(context);
-	plugin = this;
+	instance = this;
 
 	// add required properties for Arduino serial port on linux, if not
 	// defined
@@ -115,19 +120,10 @@ public void stop(BundleContext context) throws Exception {
 	IJobManager jobMan = Job.getJobManager();
 	jobMan.cancel(FamilyJob.MY_FAMILY);
 	jobMan.join(FamilyJob.MY_FAMILY, null);
-	plugin = null;
+	instance = null;
 	super.stop(context);
     }
 
-    /**
-     * Returns the shared instance
-     * 
-     * @return the shared instance
-     */
-    public static Activator getDefault() {
-	return plugin;
-    }
-
     static boolean isInternetReachable() {
 	HttpURLConnection urlConnect = null;
 

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

@@ -231,11 +231,10 @@ public static String GetARDUINODefineValue() {
 	    String fields[] = Ret.split("\\.");
 	    if (fields.length != 3) {
 		Common.log(new Status(IStatus.WARNING, ArduinoConst.CORE_PLUGIN_ID, "Malformed Arduino IDE version expected X.Y.Z got " + Ret, null));
+	    } else {
+		Ret = String.format("%d%02d%02d", Integer.valueOf(fields[0]), Integer.valueOf(fields[1]), Integer.valueOf(fields[2]));
 	    }
-	    Ret = String.format("%d%02d%02d", Integer.valueOf(fields[0]), Integer.valueOf(fields[1]), Integer.valueOf(fields[2]));
-
 	}
-
 	return Ret;
     }
 

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

@@ -2,6 +2,7 @@
 
 import it.baeyens.arduino.arduino.Serial;
 
+import java.io.File;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Vector;
@@ -15,6 +16,7 @@
 import org.eclipse.cdt.core.settings.model.ICProjectDescription;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -457,7 +459,7 @@ public static String[] listBaudRates() {
 	return outgoing;
     }
 
-    public static Object listLineEndings() {
+    public static String[] listLineEndings() {
 	String outgoing[] = { "none", "CR", "NL", "CR/NL" };
 	return outgoing;
     }
@@ -576,4 +578,15 @@ public static String getDefaultPrivateHardwarePath() {
 	return homPath.append("Arduino").append("hardware").toString();
     }
 
+    public static File getArduinoIDEEnvVarsName() {
+	return getPluginWritePath(ARDUINO_IDE_ENVIRONMENT_VAR_FILE_NAME);
+    }
+
+    private static File getPluginWritePath(String name) {
+	IWorkspaceRoot myWorkspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
+	File ret = myWorkspaceRoot.getLocation().append(name).toFile();
+	return ret;
+	// return PlatformUI.getWorkbench(). .getWorkbench().getActiveWorkbenchWindow();
+    }
+
 }

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

@@ -158,7 +158,7 @@ protected String getCompilerCommand(String languageId) {
 	    try {
 		compilerCommand = envManager.getVariable(ArduinoConst.ENV_KEY_recipe_c_o_pattern, confDesc, true).getValue().replace(" -o ", " ");
 	    } catch (Exception e) {
-		compilerCommand = "gcc";
+		compilerCommand = "";
 	    }
 	    IEnvironmentVariable op1 = envManager.getVariable(ArduinoConst.ENV_KEY_JANTJE_ADDITIONAL_COMPILE_OPTIONS, confDesc, true);
 	    IEnvironmentVariable op2 = envManager.getVariable(ArduinoConst.ENV_KEY_JANTJE_ADDITIONAL_C_COMPILE_OPTIONS, confDesc, true);
@@ -170,7 +170,11 @@ protected String getCompilerCommand(String languageId) {
 	    }
 	    compilerCommand = compilerCommand + " -D__IN_ECLIPSE__=1";
 	} else if (languageId.equals("org.eclipse.cdt.core.g++")) {
-	    compilerCommand = envManager.getVariable(ArduinoConst.ENV_KEY_recipe_cpp_o_pattern, confDesc, true).getValue().replace(" -o ", " ");
+	    try {
+		compilerCommand = envManager.getVariable(ArduinoConst.ENV_KEY_recipe_cpp_o_pattern, confDesc, true).getValue().replace(" -o ", " ");
+	    } catch (Exception e) {
+		compilerCommand = "";
+	    }
 	    IEnvironmentVariable op1 = envManager.getVariable(ArduinoConst.ENV_KEY_JANTJE_ADDITIONAL_COMPILE_OPTIONS, confDesc, true);
 	    IEnvironmentVariable op2 = envManager.getVariable(ArduinoConst.ENV_KEY_JANTJE_ADDITIONAL_CPP_COMPILE_OPTIONS, confDesc, true);
 	    if (op1 != null) {

it.baeyens.arduino.core/src/it/baeyens/arduino/toolchain/ArduinoLanguageProvider.java

@@ -618,17 +618,17 @@ private static void setTheEnvironmentVariablesSetTheDefaults(IContributedEnviron
     }
 
     /**
-     * This method parses the platform.txt file for values to be added to the environment variables
+     * This method parses a file with environment variables like the platform.txt file for values to be added to the environment variables
      * 
      * @param contribEnv
      * @param confDesc
-     * @param platformFile
+     * @param envVarFile
      *            The file to parse
      * @throws IOException
      */
-    private static void setTheEnvironmentVariablesAddthePlatformTxt(IContributedEnvironment contribEnv, ICConfigurationDescription confDesc,
-	    IPath platformFile) throws IOException {
-	try (DataInputStream dataInputStream = new DataInputStream(new FileInputStream(platformFile.toOSString()));
+    private static void setTheEnvironmentVariablesAddAFile(IContributedEnvironment contribEnv, ICConfigurationDescription confDesc, IPath envVarFile)
+	    throws IOException {
+	try (DataInputStream dataInputStream = new DataInputStream(new FileInputStream(envVarFile.toOSString()));
 		BufferedReader br = new BufferedReader(new InputStreamReader(dataInputStream));) {
 	    String strLine;
 
@@ -799,10 +799,13 @@ public static void setTheEnvironmentVariables(IProject project, ICConfigurationD
 	// and boards.txt will
 	// overwrite the default settings
 	setTheEnvironmentVariablesSetTheDefaults(contribEnv, confDesc, platformFilename);
+
 	try {
+	    IPath arduinoIDEVarsFile = new Path(Common.getArduinoIDEEnvVarsName().getCanonicalPath());
+	    setTheEnvironmentVariablesAddAFile(contribEnv, confDesc, arduinoIDEVarsFile);
 	    // process the platform.txt file first. This way the boards.txt will
 	    // overwrite the default settings
-	    setTheEnvironmentVariablesAddthePlatformTxt(contribEnv, confDesc, platformFilename);
+	    setTheEnvironmentVariablesAddAFile(contribEnv, confDesc, platformFilename);
 	    // now process the boards file
 	    setTheEnvironmentVariablesAddtheBoardsTxt(contribEnv, confDesc, boardFileName, boardName);
 	    // Do some post processing

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

@@ -4,13 +4,17 @@
 import it.baeyens.arduino.common.ArduinoInstancePreferences;
 import it.baeyens.arduino.common.Common;
 import it.baeyens.arduino.tools.ArduinoHelpers;
+import it.baeyens.arduino.tools.ExternalCommandLauncher;
 import it.baeyens.arduino.tools.MyDirectoryFieldEditor;
 
 import java.awt.Desktop;
+import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.List;
 
 import org.eclipse.core.filesystem.URIUtil;
 import org.eclipse.core.resources.IPathVariableManager;
@@ -136,15 +140,14 @@ private boolean showError(String dialogMessage) {
     public boolean performOk() {
 	if (!testStatus())
 	    return false;
-	if (!mIsDirty)
-	    return true;
 
 	if (mArduinoIdeVersion.getStringValue().compareTo("1.5.0") < 0) {
 	    showError("This plugin is for Arduino IDE 1.5.x. \nPlease use V1 of the plugin for earlier versions.");
 	    return false;
 	}
 	String infoMessage = null;
 	boolean addMake = true;
+	boolean getEnvVarsFromArduinoIDE = true;
 	switch (mArduinoIdeVersion.getStringValue()) {
 	case "1.5.0":
 	case "1.5.1":
@@ -153,12 +156,14 @@ public boolean performOk() {
 	case "1.5.4":
 	    infoMessage = "Arduino IDE " + mArduinoIdeVersion.getStringValue() + " is not supported.";
 	    addMake = false;
+	    getEnvVarsFromArduinoIDE = false;
 	    break;
 	case "1.5.5":
 	case "1.5.6":
 	case "1.5.6-r2":
 	    infoMessage = "Arduino IDE " + mArduinoIdeVersion.getStringValue() + " works but you need to adapt some libraries. Not Advised";
 	    addMake = false;
+	    getEnvVarsFromArduinoIDE = false;
 	    break;
 	case "1.5.7":
 	case "1.5.8":
@@ -168,14 +173,17 @@ public boolean performOk() {
 	    } else {
 		infoMessage = "Arduino IDE " + mArduinoIdeVersion.getStringValue() + " works.";
 	    }
+	    getEnvVarsFromArduinoIDE = false;
 	    break;
 	case "1.6.1":
 	    infoMessage = "Arduino IDE " + mArduinoIdeVersion.getStringValue() + " works great.";
+	    getEnvVarsFromArduinoIDE = false;
 	    break;
 	case "1.6.2":
 	case "1.6.3":
 	case "1.6.4":
 	    infoMessage = "Arduino IDE " + mArduinoIdeVersion.getStringValue() + " only works with Teensy.";
+	    getEnvVarsFromArduinoIDE = false;
 	    break;
 	default:
 	    infoMessage = "You are using a version of the Arduino IDE that is unknow or newer than available at the release of this plugin.";
@@ -192,6 +200,46 @@ public boolean performOk() {
 
 	super.performOk();
 	setWorkSpacePathVariables();
+	File arduinoIDEenvVars = Common.getArduinoIDEEnvVarsName();
+
+	if (getEnvVarsFromArduinoIDE) {
+	    IPath ArduinoIDEPath = ArduinoInstancePreferences.getArduinoPath();
+	    String command = "\"" + URIUtil.toURI(ArduinoIDEPath.append("arduino")).getPath() + "\" --get-pref";
+	    ExternalCommandLauncher commandLauncher = new ExternalCommandLauncher(command);
+	    try {
+		if (commandLauncher.launch() != 0) {
+		    Common.log(new Status(IStatus.ERROR, ArduinoConst.CORE_PLUGIN_ID,
+			    "Failed to extract environment info from arduino ide 'arduino --get-pref'. The setup will not work properly", null));
+		}
+	    } catch (IOException e) {
+		Common.log(new Status(IStatus.ERROR, ArduinoConst.CORE_PLUGIN_ID,
+			"Failed to extract environment info from arduino ide 'arduino --get-pref'. The setup will not work properly", e));
+	    }
+	    // List<String> err = commandLauncher.getStdErr();
+	    List<String> out = commandLauncher.getStdOut();
+	    try (BufferedWriter output = new BufferedWriter(new FileWriter(arduinoIDEenvVars));) {
+		output.write("This file has been generated automatically.");
+		output.newLine();
+		output.write("Please do not change.");
+		output.newLine();
+		for (String item : out) {
+		    output.write(item);
+		    output.newLine();
+		}
+		output.close();
+	    } catch (IOException e) {
+		Common.log(new Status(IStatus.ERROR, ArduinoConst.CORE_PLUGIN_ID,
+			"Failed to extract environment info from arduino ide 'arduino --get-pref'. The setup will not work properly", e));
+
+	    }
+	} else {
+	    try {
+		arduinoIDEenvVars.delete();
+	    } catch (Exception e) {
+		Common.log(new Status(IStatus.ERROR, ArduinoConst.CORE_PLUGIN_ID, "Failed to delete the file " + arduinoIDEenvVars
+			+ ". The setup may not work properly", e));
+	    }
+	}
 	// reset the previous selected values
 	ArduinoInstancePreferences.SetLastUsedArduinoBoard("");
 	ArduinoInstancePreferences.SetLastUsedUploadPort("");