#1498 stuff mostly seems to work but discovery no longer works

Author: jantje

io.sloeber.core/plugin.xml

@@ -355,13 +355,7 @@
                     id="io.sloeber.tool.combiner.ar.input"
                     multipleOfType="true"
                     name="Build Archives"
-                    primaryInput="false"
-                    sources="ar">
-              </inputType>
-              <inputType
-                    id="io.sloeber.tool.combiner.fixed.ar.input"
-                    multipleOfType="true"
-                    name="provided archives"
+                    option="ARCHIVES"
                     primaryInput="false"
                     sources="ar">
               </inputType>

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

@@ -1648,6 +1648,17 @@ protected boolean addRuleForTool(ITool tool, StringBuffer buffer, boolean bTarge
             // resolve any remaining macros in the command after it has been
             // generated
             try {
+                //TOFIX JABA heavy hack to get the combiner to work properly
+                //if the command contains ${ARCHIVES}
+                //remove the ${AR}
+                //replace ${ARCHIVES} with ${AR}
+                String ARCHIVES = " ${ARCHIVES} ";
+                String AR = " $(AR) ";
+                if (buildCmd.contains(ARCHIVES)) {
+                    buildCmd = buildCmd.replace(AR, " ");
+                    buildCmd = buildCmd.replace(ARCHIVES, AR);
+                }
+                //end JABA heavy hack
                 String resolvedCommand = ManagedBuildManager.getBuildMacroProvider().resolveValueToMakefileFormat(
                         buildCmd, EMPTY_STRING, WHITESPACE, IBuildMacroProvider.CONTEXT_FILE,
                         new FileContextData(null, null, null, tool));

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 04 ";
+    private static final String FIRST_SLOEBER_WORKAROUND_LINE = "#Sloeber created TXT file V2.00.test 07 ";
 
     /**
      * workarounds done at installation time. I try to keep those at a minimum but
@@ -320,39 +320,43 @@ private static String platformApplyStandardWorkArounds(String inPlatformTxt) {
 
         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}";
+            String changed = origRecipe + " ";
+            changed = changed.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);
         }
 
         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}";
+            String changed = origRecipe + " ";
+            changed = changed.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);
         }
 
         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}";
+            String changed = origRecipe + " ";
+            changed = changed.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);
         }
 
         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}";
+            String changed = origRecipe + " ";
+            changed = changed.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);
         }
 
@@ -361,13 +365,14 @@ private static String platformApplyStandardWorkArounds(String inPlatformTxt) {
             // 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 changed = origRecipe.replaceAll("(\\{build\\.path})(/core)?/sys", "$1/core/core/sys");
+            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}");
+            changed = changed.replace(" \"{build.path}/{archive_file}\" ", " {ARCHIVES} ");
+            changed = changed.replace(" \"{archive_file_path}\" ", " {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}";
+                    + "{sloeber.extra_all} {sloeber.extra.link}{sloeber.post.link}";
             platformTXT = platformTXT.replace(origRecipe, changed);
         }