#1498 environ names as toolPattern and expand them in gnuMakefileGen

jantje · jantje · commit 863f5d348dc6 · 2022-09-22T03:59:47.000+02:00
By expanding the environment name I can match the platform.sloeber.txt
with what CDT wants.
This makes for a better match between the sloeber run commands and the
arduino IDE run commands
Only the combiner does not place the archives in the same place as
Arduino IDE
diff --git a/io.sloeber.core/plugin.xml b/io.sloeber.core/plugin.xml
@@ -162,7 +162,7 @@
            <tool
                  announcement="%tool.Arduino.CPP.announcement"
                  command="${recipe.cpp.o.pattern}"
-                 commandLinePattern="${recipe.cpp.o.pattern} ${FLAGS} -D__IN_ECLIPSE__=1  ${INPUTS} -o ${OUTPUT} ${sloeber.extra.compile} ${sloeber.extra.cpp.compile} ${sloeber.extra.all}"
+                 commandLinePattern="recipe.cpp.o.pattern"
                  errorParsers="org.eclipse.cdt.core.GCCErrorParser"
                  id="io.sloeber.tool.sketch.compiler.cpp"
                  name="%tool.Arduino.CPP2O.name"
@@ -209,7 +209,7 @@
            <tool
                  announcement="%tool.Arduino.C.announcement"
                  command="${recipe.c.o.pattern}"
-                 commandLinePattern="${recipe.c.o.pattern} ${FLAGS} -D__IN_ECLIPSE__=1 ${INPUTS} -o ${OUTPUT} ${sloeber.extra.compile} ${sloeber.extra.c.compile} ${sloeber.extra.all}"
+                 commandLinePattern="recipe.c.o.pattern"
                  errorParsers="org.eclipse.cdt.core.GCCErrorParser"
                  id="io.sloeber.tool.compiler.c"
                  name="%tool.Arduino.C2O.name"
@@ -257,7 +257,7 @@
            <tool
                  announcement="%tool.Arduino.S.announcement"
                  command="${recipe.S.o.pattern}"
-                 commandLinePattern="${recipe.S.o.pattern} ${FLAGS}  ${INPUTS} -o ${OUTPUT}  ${sloeber.extra.assembly} ${sloeber.extra.all}"
+                 commandLinePattern="recipe.S.o.pattern"
                  errorParsers="org.eclipse.cdt.core.GCCErrorParser"
                  id="io.sloeber.tool.sketch.compiler.s"
                  name="%tool.Arduino.S20.name"
@@ -304,7 +304,7 @@
            <tool
                  announcement="%tool.Arduino.archiver.announcement"
                  command="${recipe.ar.pattern}"
-                 commandLinePattern="${recipe.ar.pattern} ${FLAGS}  ${archive_file_path} ${INPUTS} ${sloeber.extra_archive} ${sloeber.extra_all}"
+                 commandLinePattern="recipe.ar.pattern"
                  errorParsers="org.eclipse.cdt.core.GLDErrorParser"
                  id="io.sloeber.tool.ar"
                  name="%tool.archiver.name">
@@ -329,7 +329,7 @@
            <tool
                  announcement="%tool.Arduino.combiner.announcement"
                  command="${recipe.c.combine.pattern}"
-                 commandLinePattern="${sloeber.pre.link}${recipe.c.combine.pattern} ${FLAGS} ${INPUTS} ${AR} ${sloeber.extra_all} ${sloeber.extra.link}${sloeber.post.link}"
+                 commandLinePattern="recipe.c.combine.pattern"
                  errorParsers="org.eclipse.cdt.core.GLDErrorParser"
                  id="io.sloeber.tool.combine"
                  name="%tool.combiner.name"
@@ -396,7 +396,7 @@
            <tool
                  announcement="%tool.printsize.announcement"
                  command="${sloeber.size.switch} "
-                 commandLinePattern="${COMMAND}"
+                 commandLinePattern="${sloeber.size.switch} "
                  id="io.sloeber.tool.size"
                  isAbstract="false"
                  name="%tool.printsize.name">
diff --git a/io.sloeber.core/src/io/sloeber/core/common/Common.java b/io.sloeber.core/src/io/sloeber/core/common/Common.java
@@ -171,7 +171,8 @@ static public String getBuildEnvironmentVariable(IProject project, String config
 
     /**
      *
-     * Provides the build environment variable based on project and string This
+     * Provides the build environment variable based on project default
+     * configuration and string This
      * method does not add any knowledge.(like adding A.)
      *
      * @param project
@@ -185,7 +186,7 @@ static public String getBuildEnvironmentVariable(IProject project, String config
      */
     static public String getBuildEnvironmentVariable(IProject project, String envName, String defaultvalue) {
         ICProjectDescription prjDesc = CoreModel.getDefault().getProjectDescription(project);
-        return getBuildEnvironmentVariable(prjDesc.getDefaultSettingConfiguration(), envName, defaultvalue);
+        return getBuildEnvironmentVariable(prjDesc.getDefaultSettingConfiguration(), envName, defaultvalue, true);
     }
 
     /**
diff --git a/io.sloeber.core/src/io/sloeber/core/toolchain/ArduinoGnuMakefileGenerator.java b/io.sloeber.core/src/io/sloeber/core/toolchain/ArduinoGnuMakefileGenerator.java
@@ -48,8 +48,10 @@
 
 import org.apache.commons.io.FileUtils;
 import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.settings.model.CSourceEntry;
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.core.settings.model.ICProjectDescription;
 import org.eclipse.cdt.core.settings.model.ICSettingEntry;
 import org.eclipse.cdt.core.settings.model.ICSourceEntry;
 import org.eclipse.cdt.core.settings.model.util.CDataUtil;
@@ -906,7 +908,7 @@ public MultiStatus regenerateMakefiles() throws CoreException {
         IFile sizeAwkFile1 = root.getFile(topBuildDir.append("size.awk"));
         File sizeAwkFile = sizeAwkFile1.getLocation().toFile();
         String regex = Common.getBuildEnvironmentVariable(confDesc, "recipe.size.regex", EMPTY);
-         String awkContent = "/" + regex + "/ {arduino_size += $2 }\n";
+        String awkContent = "/" + regex + "/ {arduino_size += $2 }\n";
         regex = Common.getBuildEnvironmentVariable(confDesc, "recipe.size.regex.data", EMPTY);
         awkContent += "/" + regex + "/ {arduino_data += $2 }\n";
         regex = Common.getBuildEnvironmentVariable(confDesc, "recipe.size.regex.eeprom", EMPTY);
@@ -1628,7 +1630,7 @@ protected boolean addRuleForTool(ITool tool, StringBuffer buffer, boolean bTarge
             String[] cmdInputs = inputs.toArray(new String[inputs.size()]);
             IManagedCommandLineGenerator gen = tool.getCommandLineGenerator();
             IManagedCommandLineInfo cmdLInfo = gen.generateCommandLineInfo(tool, command, flags, outflag, outputPrefix,
-                    primaryOutputs, cmdInputs, tool.getCommandLinePattern());
+                    primaryOutputs, cmdInputs, getToolCommandLinePattern(tool));
             // The command to build
             String buildCmd = null;
             if (cmdLInfo == null) {
@@ -2212,7 +2214,7 @@ private IManagedCommandLineInfo generateToolCommandLineInfo(ITool tool, String s
         }
         IManagedCommandLineGenerator gen = tool.getCommandLineGenerator();
         return gen.generateCommandLineInfo(tool, cmd, flags, outputFlag, outputPrefix, outputName, inputResources,
-                tool.getCommandLinePattern());
+                getToolCommandLinePattern(tool));
     }
 
     /**
@@ -2577,7 +2579,7 @@ && containsSpecialCharacters(sourceLocation.toOSString()))
                 // Call the command line generator
                 IManagedCommandLineGenerator cmdLGen = tool.getCommandLineGenerator();
                 cmdLInfo = cmdLGen.generateCommandLineInfo(tool, cmd, flags, outflag, outputPrefix,
-                        OUT_MACRO + otherPrimaryOutputs, inputStrings, tool.getCommandLinePattern());
+                        OUT_MACRO + otherPrimaryOutputs, inputStrings, getToolCommandLinePattern(tool));
             } else {
                 outflag = tool.getOutputFlag();
                 outputPrefix = tool.getOutputPrefix();
@@ -4525,4 +4527,16 @@ private ToolInfoHolder getToolInfo(IPath path, boolean create) {
         }
         return h;
     }
+
+    private String getToolCommandLinePattern(ITool tool) {
+        String orgPattern = tool.getCommandLinePattern();
+        if (orgPattern.contains("$")) {
+            //if the pattern contains a space no use to try to expand it
+            return orgPattern;
+        }
+        ICProjectDescription prjDesc = CoreModel.getDefault().getProjectDescription(project);
+        ICConfigurationDescription confDesc = prjDesc.getConfigurationByName(config.getName());
+        return Common.getBuildEnvironmentVariable(confDesc, orgPattern, orgPattern, false);
+
+    }
 }
diff --git a/io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java b/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 workaound file V1.05.test 05 ";
+    private static final String FIRST_SLOEBER_WORKAROUND_LINE = "#Sloeber created TXT file V2.00.test 04 ";
 
     /**
      * workarounds done at installation time. I try to keep those at a minimum but
@@ -318,51 +318,57 @@ private static String platformApplyStandardWorkArounds(String inPlatformTxt) {
         String platformTXT = inPlatformTxt;
         String searchPlatformTXT = "\n" + inPlatformTxt;
 
-        //C o need the input and output file stuff removed as CDT wants thes at the command level
-        String inCORecipe = findLineStartingWith(platformTXT, RECIPE_C_to_O);
-        if (null != inCORecipe) {
-            String outCORecipe = inCORecipe.replace(" -o ", " ");
-            outCORecipe = outCORecipe.replace(" \"{source_file}\"", " ");
-            outCORecipe = outCORecipe.replace(" \"{object_file}\"", " ");
-            platformTXT = platformTXT.replace(inCORecipe, outCORecipe);
+        String origRecipe = findLineStartingWith(platformTXT, RECIPE_C_to_O);
+        if (null != origRecipe) {
+            String changed = origRecipe.replace("\"{source_file}\"", "{INPUTS}");
+            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);
         }
 
-        //Cpp o need the input and output file stuff removed as CDT wants thes at the command level
-        String inCppORecipe = findLineStartingWith(platformTXT, RECIPE_CPP_to_O);
-        if (null != inCppORecipe) {
-            String outCppORecipe = inCppORecipe.replace(" -o ", " ");
-            outCppORecipe = outCppORecipe.replace(" \"{source_file}\"", " ");
-            outCppORecipe = outCppORecipe.replace(" \"{object_file}\"", " ");
-            platformTXT = platformTXT.replace(inCppORecipe, outCppORecipe);
+        origRecipe = findLineStartingWith(platformTXT, RECIPE_CPP_to_O);
+        if (null != origRecipe) {
+            String changed = origRecipe.replace("\"{source_file}\"", "{INPUTS}");
+            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);
         }
 
-        //S o need the input and output file stuff removed as CDT wants thes at the command level
-        String inSORecipe = findLineStartingWith(platformTXT, RECIPE_S_to_O);
-        if (null != inSORecipe) {
-            String outSORecipe = inSORecipe.replace(" -o ", " ");
-            outSORecipe = outSORecipe.replace(" \"{source_file}\"", " ");
-            outSORecipe = outSORecipe.replace(" \"{object_file}\"", " ");
-            platformTXT = platformTXT.replace(inSORecipe, outSORecipe);
+        origRecipe = findLineStartingWith(platformTXT, RECIPE_S_to_O);
+        if (null != origRecipe) {
+            String changed = origRecipe.replace("\"{source_file}\"", "{INPUTS}");
+            changed = changed.replace("\"{object_file}\"", "{OUTPUT}");
+            changed = changed.replace("{includes}", "{FLAGS} -D__IN_ECLIPSE__=1");
+            changed = changed + " {sloeber.extra.assembly} {sloeber.extra.all}";
+            platformTXT = platformTXT.replace(origRecipe, changed);
         }
 
-        //Archiver needs the "{archive_file_path}" "{object_file}" file stuff removed as CDT wants thes at the command level
-        String inArRecipe = findLineStartingWith(platformTXT, RECIPE_AR);
-        if (null != inArRecipe) {
-            String outArRecipe = inArRecipe.replace(" {archive_file_path} ", " ");
-            outArRecipe = outArRecipe.replace(" {object_file}", " ");
-            platformTXT = platformTXT.replace(inArRecipe, outArRecipe);
+        origRecipe = findLineStartingWith(platformTXT, RECIPE_AR);
+        if (null != origRecipe) {
+            //archives should get a different key but for now I didn't get that to work
+            String changed = origRecipe.replace("\"{archive_file_path}\"", "{OUTPUT}");
+            changed = changed.replace("{archive_file_path}", "{OUTPUT}");
+            changed = changed.replace("\"{object_file}\"", "{INPUTS}");
+            changed = changed.replace("{object_file}", "{INPUTS}");
+            changed = changed + " {sloeber.extra_archive} {sloeber.extra_all}";
+            platformTXT = platformTXT.replace(origRecipe, changed);
         }
 
-        String inCombineRecipe = findLineStartingWith(platformTXT, RECIPE_C_COMBINE);
-        if (null != inArRecipe) {
+        origRecipe = findLineStartingWith(platformTXT, RECIPE_C_COMBINE);
+        if (null != origRecipe) {
             // the fix below seems no longer needed but is still on august 2021
             // Arduino treats core differently so we need to change the location of directly
             // referenced files this manifests only in the combine recipe
-            String outCombineRecipe = inCombineRecipe.replaceAll("(\\{build\\.path})(/core)?/sys", "$1/core/core/sys");
-
-            outCombineRecipe = outCombineRecipe.replace(" \"{build.path}/{archive_file}\"", " ");
-            outCombineRecipe = outCombineRecipe.replace(" {object_files}", " ");
-            platformTXT = platformTXT.replace(inCombineRecipe, outCombineRecipe);
+            String changed = origRecipe.replaceAll("(\\{build\\.path})(/core)?/sys", "$1/core/core/sys");
+
+            changed = changed.replace(" \"{build.path}/{archive_file}\"", " {ARCHIVES}");
+            changed = changed.replace(" {object_files}", " ${FLAGS} {INPUTS}");
+            String[] splits = changed.split("=", 2);
+            changed = splits[0] + "={sloeber.pre.link}" + splits[1]
+                    + " {sloeber.extra_all} {sloeber.extra.link}{sloeber.post.link}";
+            platformTXT = platformTXT.replace(origRecipe, changed);
         }
 
         // replace tools.x.y* {path}

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,8 @@ static public String getBuildEnvironmentVariable(IProject project, String config`
`171`	`171`
`172`	`172`	`/**`
`173`	`173`	`*`
`174`		`- * Provides the build environment variable based on project and string This`
	`174`	`+ * Provides the build environment variable based on project default`
	`175`	`+ * configuration and string This`
`175`	`176`	`* method does not add any knowledge.(like adding A.)`
`176`	`177`	`*`
`177`	`178`	`* @param project`
`@@ -185,7 +186,7 @@ static public String getBuildEnvironmentVariable(IProject project, String config`
`185`	`186`	`*/`
`186`	`187`	`static public String getBuildEnvironmentVariable(IProject project, String envName, String defaultvalue) {`
`187`	`188`	`ICProjectDescription prjDesc = CoreModel.getDefault().getProjectDescription(project);`
`188`		`- return getBuildEnvironmentVariable(prjDesc.getDefaultSettingConfiguration(), envName, defaultvalue);`
	`189`	`+ return getBuildEnvironmentVariable(prjDesc.getDefaultSettingConfiguration(), envName, defaultvalue, true);`
`189`	`190`	`}`
`190`	`191`
`191`	`192`	`/**`