#1498 put the codan commands in the sloeber.txt file

Author: jantje

io.sloeber.core/src/io/sloeber/core/api/SloeberProject.java

@@ -403,12 +403,6 @@ private HashMap<String, String> getEnvVars(String configKey) {
                     + makeEnvironmentVar(ENV_KEY_BUILD_GENERIC_PATH) + pathDelimiter + makeEnvironmentVar("PATH")); //$NON-NLS-1$
         }
 
-        // Set the codeAnalyzer compile commands
-        allVars.put(CODAN_C_to_O,
-                "${recipe.c.o.pattern.1} -D__IN_ECLIPSE__=1 ${recipe.c.o.pattern.2} ${recipe.c.o.pattern.3} ${sloeber.extra.compile} ${sloeber.extra.c.compile} ${sloeber.extra.all}"); //$NON-NLS-1$
-        allVars.put(CODAN_CPP_to_O,
-                "${recipe.cpp.o.pattern.1} -D__IN_ECLIPSE__=1 -x c++  ${recipe.cpp.o.pattern.2} ${recipe.cpp.o.pattern.3} ${sloeber.extra.compile} ${sloeber.extra.cpp.compile} ${sloeber.extra.all}"); //$NON-NLS-1$
-
         return allVars;
     }
 

io.sloeber.core/src/io/sloeber/core/toolchain/ArduinoLanguageProvider.java

@@ -1,48 +1,26 @@
 package io.sloeber.core.toolchain;
 
-import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.core.envvar.IEnvironmentVariableManager;
-import org.eclipse.cdt.core.model.CoreModel;
-import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
-import org.eclipse.cdt.core.settings.model.ICProjectDescription;
+import static io.sloeber.core.common.Const.*;
+
 import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
 import org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector;
 
-import io.sloeber.core.common.Const;
-
-@SuppressWarnings({"nls","unused"})
-public class ArduinoLanguageProvider extends GCCBuiltinSpecsDetector{
-
-	
-
-	@Override
-	protected String getCompilerCommand(String languageId) {
-        String ret = new String();
-
-		ICProjectDescription prjDesc = CoreModel.getDefault().getProjectDescription(currentProject);
-		if (prjDesc == null)
-            return ret;
-		ICConfigurationDescription confDesc = prjDesc.getActiveConfiguration();
-
-        String codanVarName = new String();
-		if (languageId.equals("org.eclipse.cdt.core.gcc")) {
-            codanVarName = Const.CODAN_C_to_O;
-		} else if (languageId.equals("org.eclipse.cdt.core.g++")) {
-            codanVarName = Const.CODAN_CPP_to_O;
-		} else {
-			ManagedBuilderCorePlugin.error(
-					"Unable to find compiler command for language " + languageId + " in toolchain=" + getToolchainId());
-		}
+@SuppressWarnings({ "nls", "unused" })
+public class ArduinoLanguageProvider extends GCCBuiltinSpecsDetector {
 
-		try {
-            IEnvironmentVariableManager envManager = CCorePlugin.getDefault().getBuildEnvironmentManager();
-            ret = envManager.getVariable(codanVarName, confDesc, false).getValue();
-		} catch (Exception e) {
-            ret = new String();
-		}
+    @Override
+    protected String getCompilerCommand(String languageId) {
 
+        if (languageId.equals("org.eclipse.cdt.core.gcc")) {
+            return "${" + CODAN_C_to_O + "}";
+        } else if (languageId.equals("org.eclipse.cdt.core.g++")) {
+            return "${" + CODAN_CPP_to_O + "}";
+        } else {
+            ManagedBuilderCorePlugin.error(
+                    "Unable to find compiler command for language " + languageId + " in toolchain=" + getToolchainId());
+        }
 
-        return ret;
-	}
+        return null;
+    }
 
 }

io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java

@@ -45,7 +45,7 @@
 public class WorkAround extends Const {
     // Each time this class is touched consider changing the String below to enforce
     // updates
-    private static final String FIRST_SLOEBER_WORKAROUND_LINE = "#Sloeber created TXT file V2.00.test 07 ";
+    private static final String FIRST_SLOEBER_WORKAROUND_LINE = "#Sloeber created TXT file V2.00.test 09 ";
 
     /**
      * workarounds done at installation time. I try to keep those at a minimum but
@@ -325,7 +325,12 @@ private static String platformApplyStandardWorkArounds(String inPlatformTxt) {
             changed = changed.replace(" \"{object_file}\" ", " {OUTPUT} ");
             changed = changed.replace(" {includes} ", " {FLAGS} -D__IN_ECLIPSE__=1 ");
             changed = changed + "{sloeber.extra.compile} {sloeber.extra.c.compile} {sloeber.extra.all}";
-            platformTXT = platformTXT.replace(origRecipe, changed);
+            String codan = changed.replace(RECIPE_C_to_O, CODAN_C_to_O);
+            codan = codan.replace(" -o ", " ");
+            codan = codan.replace(" {FLAGS} ", " ");
+            codan = codan.replace(" {OUTPUT} ", " ");
+
+            platformTXT = platformTXT.replace(origRecipe, changed + NEWLINE + codan);
         }
 
         origRecipe = findLineStartingWith(platformTXT, RECIPE_CPP_to_O);
@@ -335,7 +340,12 @@ private static String platformApplyStandardWorkArounds(String inPlatformTxt) {
             changed = changed.replace(" \"{object_file}\" ", " {OUTPUT}  ");
             changed = changed.replace(" {includes} ", " {FLAGS} -D__IN_ECLIPSE__=1 ");
             changed = changed + "{sloeber.extra.compile} {sloeber.extra.cpp.compile} {sloeber.extra.all}";
-            platformTXT = platformTXT.replace(origRecipe, changed);
+            String codan = changed.replace(RECIPE_CPP_to_O, CODAN_CPP_to_O);
+            codan = codan.replace(" -o ", " ");
+            codan = codan.replace(" {FLAGS} ", " ");
+            codan = codan.replace(" {OUTPUT} ", " ");
+
+            platformTXT = platformTXT.replace(origRecipe, changed + NEWLINE + codan);
         }
 
         origRecipe = findLineStartingWith(platformTXT, RECIPE_S_to_O);