fixed issue #95 Plugin ignores custom boards.txt

Author: jantje

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

@@ -1,5 +1,6 @@
 package it.baeyens.arduino.common;
 
+
 /**
  * ArduinoConst only contains global strings used in the eclipse plugin.
  * 
@@ -31,6 +32,7 @@ public class ArduinoConst {
     public static final String KEY_RXTXDISABLED = "Arduino DisAbleRXTX";
     public static final String KEY_ARDUINOPATH = "Arduino Path";
     public static final String KEY_PRIVATE_LIBRARY_PATH = "Private Library Path";
+    public static final String KEY_PRIVATE_HARDWARE_PATH = "Private hardware Path";
 
     // properties keys
     public static final String KEY_LAST_USED_ARDUINOBOARD = "Arduino Board";
@@ -80,6 +82,7 @@ public class ArduinoConst {
     public static final String ENV_KEY_SOFTWARE = ENV_KEY_ARDUINO_START + "SOFTWARE";
     public static final String ENV_KEY_ARCHITECTURE = ENV_KEY_ARDUINO_START + "ARCHITECTURE";
     public static final String ENV_KEY_BUILD_ARCH = ENV_KEY_ARDUINO_START + "BUILD.ARCH";
+    public static final String ENV_KEY_HARDWARE_PATH = ENV_KEY_ARDUINO_START + "RUNTIME.HARDWARE.PATH";
 
     public static final String ENV_KEY_runtime_ide_version = ENV_KEY_ARDUINO_START + "RUNTIME.IDE.VERSION";
     public static final String ENV_KEY_build_path = ENV_KEY_ARDUINO_START + "BUILD.PATH";

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

@@ -251,4 +251,20 @@ public static void setLastTemplateFolderName(String folderName) {
 	setGlobalValue(ENV_KEY_SKETCH_TEMPLATE_FOLDER, folderName);
 
     }
+
+    public static String getPrivateLibraryPath() {
+	return getGlobalValue(KEY_PRIVATE_LIBRARY_PATH);
+    }
+
+    public static void setPrivateLibraryPath(String folderName) {
+	setGlobalValue(KEY_PRIVATE_LIBRARY_PATH, folderName);
+    }
+
+    public static String getPrivateHardwarePath() {
+	return getGlobalValue(KEY_PRIVATE_HARDWARE_PATH);
+    }
+
+    public static void setPrivateHardwarePath(String folderName) {
+	setGlobalValue(KEY_PRIVATE_HARDWARE_PATH, folderName);
+    }
 }

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

@@ -18,7 +18,9 @@
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.core.runtime.Status;
@@ -689,4 +691,25 @@ static public String getArduinoIdeSuffix() {
 	return ArduinoIdeSuffix_WIN;
     }
 
+    /**
+     * Arduino has the default libraries in the user home directory in subfolder Arduino/libraries. As the home directory is platform dependent
+     * getting the value is resolved by this method
+     * 
+     * @return the folder where Arduino puts the libraries by default.
+     */
+    public static String getDefaultPrivateLibraryPath() {
+	IPath homPath = new Path(System.getProperty("user.home"));
+	return homPath.append("Arduino").append("libraries").toString();
+    }
+
+    /**
+     * same as getDefaultLibPath but for the hardware folder
+     * 
+     * @return
+     */
+    public static String getDefaultPrivateHardwarePath() {
+	IPath homPath = new Path(System.getProperty("user.home"));
+	return homPath.append("Arduino").append("hardware").toString();
+    }
+
 }

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

@@ -486,11 +486,13 @@ private static void setTheEnvironmentVariablesSetTheDefaults(IContributedEnviron
 	IEnvironmentVariable var = new EnvironmentVariable(ENV_KEY_ARDUINO_PATH, getArduinoPath().toString());
 	contribEnv.addVariable(var, confDesc);
 
-	// from 1.5.3 onwards 2 more environment variables need to be added
+	// from 1.5.3 onwards 3 more environment variables need to be added
 	var = new EnvironmentVariable(ENV_KEY_ARCHITECTURE, platformFile.removeLastSegments(1).lastSegment());
 	contribEnv.addVariable(var, confDesc);
 	var = new EnvironmentVariable(ENV_KEY_BUILD_ARCH, platformFile.removeLastSegments(1).lastSegment().toUpperCase());
 	contribEnv.addVariable(var, confDesc);
+	var = new EnvironmentVariable(ENV_KEY_HARDWARE_PATH, platformFile.removeLastSegments(3).toString());
+	contribEnv.addVariable(var, confDesc);
 
 	// I'm not sure why but till now arduino refused to put this in the platform.txt file
 	// I won't call them idiots for this but it is getting close
@@ -972,14 +974,15 @@ public static String[] getPlatformFiles() {
     public static String[] getBoardsFiles() {
 	File HardwareFolder = ArduinoInstancePreferences.getArduinoPath().append(ArduinoConst.ARDUINO_HARDWARE_FOLDER_NAME).toFile();
 
-	HashSet<String> Hardwarelists = new HashSet<String>();
-	searchFiles(HardwareFolder, Hardwarelists, ArduinoConst.BOARDS_FILE_NAME, 3);
-	if (Hardwarelists.size() == 0) {
+	HashSet<String> boardFiles = new HashSet<String>();
+	searchFiles(HardwareFolder, boardFiles, ArduinoConst.BOARDS_FILE_NAME, 3);
+	if (boardFiles.size() == 0) {
 	    Common.log(new Status(IStatus.ERROR, ArduinoConst.CORE_PLUGIN_ID, "No boards.txt files found in the arduino hardware folder", null));
 	    return null;
 	}
+	searchFiles(new File(getPrivateHardwarePath()), boardFiles, ArduinoConst.BOARDS_FILE_NAME, 3);
 
-	return Hardwarelists.toArray(new String[Hardwarelists.size()]);
+	return boardFiles.toArray(new String[boardFiles.size()]);
 
     }
 

it.baeyens.arduino.core/src/it/baeyens/arduino/ui/ArduinoPreferencePage.java

@@ -48,6 +48,7 @@ public class ArduinoPreferencePage extends FieldEditorPreferencePage implements
     private StringFieldEditor mArduinoIdeVersion;
     private MyDirectoryFieldEditor mArduinoIdePath;
     private DirectoryFieldEditor mArduinoPrivateLibPath;
+    private DirectoryFieldEditor mArduinoPrivateHardwarePath;
     private boolean mIsDirty = false;
     private IPath mPrefBoardFile = null;
 
@@ -175,9 +176,25 @@ protected void createFieldEditors() {
 	mArduinoIdePath = new MyDirectoryFieldEditor(ArduinoConst.KEY_ARDUINOPATH, "Arduino IDE path", parent, Common.getArduinoIdeSuffix());
 
 	addField(mArduinoIdePath.getfield());
+
+	String LibPath = ArduinoInstancePreferences.getPrivateLibraryPath();
+	if (LibPath.isEmpty()) {
+	    String libraryPath = Common.getDefaultPrivateLibraryPath();
+	    new File(libraryPath).mkdirs();
+	    ArduinoInstancePreferences.setPrivateLibraryPath(libraryPath);
+	}
 	mArduinoPrivateLibPath = new DirectoryFieldEditor(ArduinoConst.KEY_PRIVATE_LIBRARY_PATH, "Private Library path", parent);
 	addField(mArduinoPrivateLibPath);
 
+	LibPath = ArduinoInstancePreferences.getPrivateHardwarePath();
+	if (LibPath.isEmpty()) {
+	    String hardwarePath = Common.getDefaultPrivateHardwarePath();
+	    new File(hardwarePath).mkdirs();
+	    ArduinoInstancePreferences.setPrivateHardwarePath(hardwarePath);
+	}
+	mArduinoPrivateHardwarePath = new DirectoryFieldEditor(ArduinoConst.KEY_PRIVATE_HARDWARE_PATH, "Private hardware path", parent);
+	addField(mArduinoPrivateHardwarePath);
+
 	Dialog.applyDialogFont(parent);
 
 	addField(new BooleanFieldEditor(ArduinoConst.KEY_RXTXDISABLED, "Disable RXTX (disables Arduino reset during upload and the serial monitor)",

it.baeyens.arduino.core/src/it/baeyens/arduino/ui/Import_Arduino_Libraries_Page.java

@@ -111,7 +111,7 @@ protected void createSourceGroup(Composite parent) {
 	    if ((HardwareLibraryPath.toFile().exists()) && (HardwareLibraryPath.toFile().list().length > 0)) {
 		// Create Arduino Item
 		myArduinoHardwareLibItem = new TreeItem(myLibrarySelector, SWT.NONE);
-		myArduinoHardwareLibItem.setText("Arduino Hardware Libraries");
+		myArduinoHardwareLibItem.setText("Hardware provided Libraries");
 		// Add the Arduino Libs
 		AddLibs(myArduinoHardwareLibItem, HardwareLibraryPath);
 	    }