fix #363

Also fixed issues when using cpp and arduino projects

Author: jantje

it.baeyens.arduino.core/src/it/baeyens/arduino/listeners/IndexerListener.java

@@ -12,11 +12,13 @@
 import org.eclipse.cdt.core.index.IIndexerStateEvent;
 import org.eclipse.cdt.core.index.IIndexerStateListener;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 
+import it.baeyens.arduino.common.Const;
 import it.baeyens.arduino.common.InstancePreferences;
 import it.baeyens.arduino.tools.Libraries;
 
@@ -26,7 +28,15 @@ public class IndexerListener implements IIndexChangeListener, IIndexerStateListe
 
     @Override
     public void indexChanged(IIndexChangeEvent event) {
-	this.ChangedProjects.add(event.getAffectedProject().getProject());
+	IProject project = event.getAffectedProject().getProject();
+	try {
+	    if (project.hasNature(Const.ArduinoNatureID)) {
+		this.ChangedProjects.add(project);
+	    }
+	} catch (CoreException e) {
+	    // TODO Auto-generated catch block
+	    e.printStackTrace();
+	}
 
     }
 

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

@@ -33,14 +33,13 @@ private enum State {
 
     private State state = State.NONE;
 
-    @SuppressWarnings("nls")
     private static final AbstractOptionParser[] optionParsers = {
-	    new IncludePathOptionParser("#include \"(\\S.*)\"", "$1", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY | ICSettingEntry.LOCAL),
-	    new IncludePathOptionParser("#include <(\\S.*)>", "$1", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY),
-	    new IncludePathOptionParser("#framework <(\\S.*)>", "$1",
+	    new IncludePathOptionParser("#include \"(\\S.*)\"", "$1", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY | ICSettingEntry.LOCAL), //$NON-NLS-1$ //$NON-NLS-2$
+	    new IncludePathOptionParser("#include <(\\S.*)>", "$1", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), //$NON-NLS-1$ //$NON-NLS-2$
+	    new IncludePathOptionParser("#framework <(\\S.*)>", "$1", //$NON-NLS-1$ //$NON-NLS-2$
 		    ICSettingEntry.BUILTIN | ICSettingEntry.READONLY | ICSettingEntry.FRAMEWORKS_MAC),
-	    new MacroOptionParser("#define\\s+(\\S*\\(.*?\\))\\s*(.*)", "$1", "$2", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY),
-	    new MacroOptionParser("#define\\s+(\\S*)\\s*(\\S*)", "$1", "$2", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), };
+	    new MacroOptionParser("#define\\s+(\\S*\\(.*?\\))\\s*(.*)", "$1", "$2", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+	    new MacroOptionParser("#define\\s+(\\S*)\\s*(\\S*)", "$1", "$2", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     @Override
     public String getToolchainId() {
@@ -61,44 +60,43 @@ private static List<String> makeList(String line) {
 	return list;
     }
 
-    @SuppressWarnings("nls")
     @Override
     protected List<String> parseOptions(String lineIn) {
 	String line = lineIn.trim();
 
 	// contribution of -dD option
-	if (line.startsWith("#define")) {
+	if (line.startsWith("#define")) { //$NON-NLS-1$
 	    return makeList(line);
 	}
 
 	// contribution of includes
-	if (line.equals("#include \"...\" search starts here:")) {
+	if (line.equals("#include \"...\" search starts here:")) { //$NON-NLS-1$
 	    this.state = State.EXPECTING_LOCAL_INCLUDE;
-	} else if (line.equals("#include <...> search starts here:")) {
+	} else if (line.equals("#include <...> search starts here:")) { //$NON-NLS-1$
 	    this.state = State.EXPECTING_SYSTEM_INCLUDE;
-	} else if (line.startsWith("End of search list.")) {
+	} else if (line.startsWith("End of search list.")) { //$NON-NLS-1$
 	    this.state = State.NONE;
-	} else if (line.equals("Framework search starts here:")) {
+	} else if (line.equals("Framework search starts here:")) { //$NON-NLS-1$
 	    this.state = State.EXPECTING_FRAMEWORKS;
-	} else if (line.startsWith("End of framework search list.")) {
+	} else if (line.startsWith("End of framework search list.")) { //$NON-NLS-1$
 	    this.state = State.NONE;
 	} else if (this.state == State.EXPECTING_LOCAL_INCLUDE) {
 	    // making that up for the parser to figure out
-	    line = "#include \"" + line + "\"";
+	    line = "#include \"" + line + "\""; //$NON-NLS-1$ //$NON-NLS-2$
 	    return makeList(line);
 	} else {
-	    String frameworkIndicator = "(framework directory)";
+	    String frameworkIndicator = "(framework directory)"; //$NON-NLS-1$
 	    if (this.state == State.EXPECTING_SYSTEM_INCLUDE) {
 		// making that up for the parser to figure out
 		if (line.contains(frameworkIndicator)) {
-		    line = "#framework <" + line.replace(frameworkIndicator, "").trim() + ">";
+		    line = "#framework <" + line.replace(frameworkIndicator, "").trim() + ">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		} else {
-		    line = "#include <" + line + ">";
+		    line = "#include <" + line + ">"; //$NON-NLS-1$ //$NON-NLS-2$
 		}
 		return makeList(line);
 	    } else if (this.state == State.EXPECTING_FRAMEWORKS) {
 		// making that up for the parser to figure out
-		line = "#framework <" + line.replace(frameworkIndicator, "").trim() + ">";
+		line = "#framework <" + line.replace(frameworkIndicator, "").trim() + ">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		return makeList(line);
 	    }
 	}
@@ -143,6 +141,7 @@ protected String getCompilerCommand(String languageId) {
 	// IContributedEnvironment contribEnv =
 	// envManager.getContributedEnvironment();
 	ICConfigurationDescription confDesc = prjDesc.getActiveConfiguration();
+
 	// Bug fix for CDT 8.1 fixed in 8.2
 	IFolder buildFolder = this.currentProject.getFolder(confDesc.getName());
 	if (!buildFolder.exists()) {
@@ -187,12 +186,12 @@ protected String getCompilerCommand(String languageId) {
 	    ManagedBuilderCorePlugin.error("Unable to find compiler command for language " + languageId + " in toolchain=" + getToolchainId()); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
-	String ret = compilerCommand.replaceAll("[^\\\\]\"\"", Const.EMPTY_STRING).replaceAll("  ", " "); // remove //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+	String ret = compilerCommand.replaceAll(" -MMD ", " ").replaceAll("[^\\\\]\"\"", Const.EMPTY_STRING).replaceAll("  ", " "); // remove //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
 	// "" except \""
 	// and
 	// double
 	// blanks
 	return ret;
     }
 
-}
+}

it.baeyens.arduino.feature/feature.xml

@@ -130,7 +130,6 @@ If you do not agree with this policy, then please do not install this software.
 
    <url>
       <update label="Arduino eclipse plugin V2 update site" url="http://www.baeyens.it/eclipse/V2/"/>
-      <discovery label="AVR-Eclipse offers plenty of godies for AVR development" url="http://avr-eclipse.sourceforge.net/wiki/index.php/Plugin_Download"/>
       <discovery label="jan&apos;s site with plenty of documentation" url="http://www.baeyens.it/eclipse/"/>
    </url>
 

it.baeyens.arduino.product/plugin_customization.ini

@@ -1,2 +1,2 @@
 org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = true
-org.eclipse.ui/defaultPerspectiveId=org.eclipse.cdt.ui.CPerspective
+