Reverted back to the old code for mac issue #34

This should be fixed properly one day but as I don't own a mac ...

Author: jantje

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

@@ -353,17 +353,26 @@ public static void setProjectPathVariables(IProject project, IPath platformPath)
 
 	try {
 	    Path arduinoPath = new Path(pathMan.getURIValue(ArduinoConst.WORKSPACE_PATH_VARIABLE_NAME_ARDUINO).getRawPath());
-	    // Path ArduinoPath = new Path(ArduinoURI.toString());
-	    String prefix = "${" + ArduinoConst.WORKSPACE_PATH_VARIABLE_NAME_ARDUINO + "}/";
-	    String test = prefix + arduinoHardwareLibraryPath.makeRelativeTo(arduinoPath).toString();
-	    URI uriTest = URIUtil.toURI(test);
-	    pathMan.setURIValue(ArduinoConst.WORKSPACE_PATH_VARIABLE_NAME_HARDWARE_LIB, uriTest);
-	    test = prefix + platformPath.makeRelativeTo(arduinoPath).toString();
-	    uriTest = URIUtil.toURI(test);
-	    pathMan.setURIValue(ArduinoConst.PATH_VARIABLE_NAME_ARDUINO_PLATFORM, uriTest);
-	    test = prefix + PinPath.makeRelativeTo(arduinoPath).toString();
-	    uriTest = URIUtil.toURI(test);
-	    pathMan.setURIValue(ArduinoConst.PATH_VARIABLE_NAME_ARDUINO_PINS, uriTest);
+	    // TODO the code below was changed for issue #34 (better multiple user support) but fails on Mac
+	    // So i split it to use the old code on mac.
+	    // but they should be merged
+	    if (Platform.getOS().equals(Platform.OS_MACOSX)) {
+		pathMan.setURIValue(ArduinoConst.WORKSPACE_PATH_VARIABLE_NAME_HARDWARE_LIB, URIUtil.toURI(arduinoHardwareLibraryPath));
+		pathMan.setURIValue(ArduinoConst.PATH_VARIABLE_NAME_ARDUINO_PLATFORM, URIUtil.toURI(platformPath));
+		pathMan.setURIValue(ArduinoConst.PATH_VARIABLE_NAME_ARDUINO_PINS, URIUtil.toURI(PinPath));
+	    } else {
+
+		String prefix = "${" + ArduinoConst.WORKSPACE_PATH_VARIABLE_NAME_ARDUINO + "}/";
+		String test = prefix + arduinoHardwareLibraryPath.makeRelativeTo(arduinoPath).toString();
+		URI uriTest = URIUtil.toURI(test);
+		pathMan.setURIValue(ArduinoConst.WORKSPACE_PATH_VARIABLE_NAME_HARDWARE_LIB, uriTest);
+		test = prefix + platformPath.makeRelativeTo(arduinoPath).toString();
+		uriTest = URIUtil.toURI(test);
+		pathMan.setURIValue(ArduinoConst.PATH_VARIABLE_NAME_ARDUINO_PLATFORM, uriTest);
+		test = prefix + PinPath.makeRelativeTo(arduinoPath).toString();
+		uriTest = URIUtil.toURI(test);
+		pathMan.setURIValue(ArduinoConst.PATH_VARIABLE_NAME_ARDUINO_PINS, uriTest);
+	    }
 	} catch (CoreException e) {
 	    Common.log(new Status(IStatus.ERROR, ArduinoConst.CORE_PLUGIN_ID,
 		    "Failed to create the path variable variables. The setup will not work properly", e));