#373 This changes the build chain

I now put all objcopy commands in 1 CDT toolchain step.
I find the based on RECIPE.OBJCOPY.*.PATTERN
There may arrise issues with other boards as the order is not
guaranteed!!

Author: jantje

it.baeyens.arduino.core/OSGI-INF/l10n/bundle.properties

@@ -58,9 +58,9 @@ inputType.name.1 = OBJ Files to archive
 tool.name.2 = Arduino combiner
 outputType.name.4 = ELF Binary Files as output
 inputType.name.2 = OBJ link Files
-tool.announcement.3 = Create eeprom image
-tool.name.3 = Arduino tool Create eeprom
-inputType.name.3 = Hex dump to eep input
+tool.announcement.3 = Do all objcopy commands
+tool.name.3 = Arduino tool objcopy command
+inputType.name.3 = objcopy input
 outputType.name.5 = Hex dump for eep output
 tool.announcement.4 = Create Flash image (ihex format)
 tool.name.4 = Arduino tool Create hex

it.baeyens.arduino.core/plugin.xml

@@ -784,8 +784,8 @@
            </tool>
            <tool
                  announcement="%tool.announcement.3"
-                 command="${A.RECIPE.OBJCOPY.EEP.PATTERN} "
-                 commandLinePattern="${COMMAND}"
+                 command="all objcopy commands"
+                 commandLinePattern="${JANTJE.OBJCOPY}"
                  id="it.baeyens.arduino.tool.objcopy.eep"
                  isAbstract="false"
                  name="%tool.name.3"
@@ -801,39 +801,12 @@
                     sources="elf">
               </inputType>
               <outputType
-                    buildVariable="EEP"
-                    id="it.baeyens.arduino.tool.objcopy.eep.output"
+                    buildVariable="HEX"
+                    id="it.baeyens.arduino.tool.objcopy.output"
                     multipleOfType="false"
                     name="%outputType.name.5"
-                    outputNames="${ProjName}.eep"
-                    outputs="eep">
-              </outputType>
-           </tool>
-           <tool
-                 announcement="%tool.announcement.4"
-                 command="${A.RECIPE.OBJCOPY.HEX.PATTERN} "
-                 commandLinePattern="${COMMAND}"
-                 id="it.baeyens.arduino.tool.objcopy.flash"
-                 isAbstract="false"
-                 name="%tool.name.4"
-                 natureFilter="both">
-              <inputType
-                    buildVariable="EEP"
-                    dependencyExtensions="eep"
-                    id="it.baeyens.arduino.tool.objcopy.flash.input"
-                    multipleOfType="true"
-                    name="%inputType.name.4"
-                    primaryInput="true"
-                    sourceContentType="it.baeyens.arduino.tool.eep.output"
-                    sources="eep">
-              </inputType>
-              <outputType
-                    buildVariable="FLASH_IMAGE"
-                    id="it.baeyens.arduino.tool.objcopy.flash.output"
-                    multipleOfType="false"
-                    name="%outputType.name.6"
-                    nameProvider="it.baeyens.arduino.toolchain.hexNameProvider"
-                    outputs="hex,bin">
+                    outputNames="${ProjName}.hex"
+                    outputs="hex">
               </outputType>
            </tool>
            <tool
@@ -843,12 +816,12 @@
                  id="it.baeyens.arduino.tool.size"
                  name="%tool.name.5">
               <inputType
-                    buildVariable="FLASH_IMAGE"
+                    buildVariable="HEX"
                     dependencyExtensions="hex"
                     id="it.baeyens.arduino.tool.size.input"
                     multipleOfType="true"
                     primaryInput="true"
-                    sourceContentType="it.baeyens.arduino.tool.objcopy.flash.output">
+                    sourceContentType="it.baeyens.arduino.tool.objcopy.output">
               </inputType>
               <outputType
                     buildVariable="SIZEDUMMY"

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

@@ -1110,12 +1110,17 @@ private static void setTheEnvironmentVariablesPostProcessing(IContributedEnviron
 	    setBuildEnvironmentVariable(contribEnv, confDesc, get_ENV_KEY_TOOL(ACTION_PROGRAM), uploadTool);
 	}
 
-	// Arduino uses the board approach for the tools.
-	// as I'm not, therefore I mod the tools in the command to be FQN
+	String objcopyCommand = "";
+	String objcopyCommandLinker = objcopyCommand;
+
+	// I'm looping through the set of variables to fix some things up
 	try {
 	    IEnvironmentVariable[] curVariables = contribEnv.getVariables(confDesc);
 	    for (IEnvironmentVariable curVariable : curVariables) {
 		String name = curVariable.getName();
+		// Arduino uses the board approach for the tools.
+		// as I'm not, therefore I mod the tools in the command to be
+		// FQN
 		if (name.startsWith("A.TOOLS.")) { //$NON-NLS-1$
 		    String toolID = curVariable.getName().split("\\.")[2]; //$NON-NLS-1$
 		    String recipe = curVariable.getValue();
@@ -1135,11 +1140,16 @@ private static void setTheEnvironmentVariablesPostProcessing(IContributedEnviron
 		    }
 		    setBuildEnvironmentVariable(contribEnv, confDesc, name, recipe);
 		}
+		if (name.startsWith("A.RECIPE.OBJCOPY.") && name.endsWith(".PATTERN")) {
+		    objcopyCommand += objcopyCommandLinker + makeEnvironmentVar(name);
+		    objcopyCommandLinker = "\n\t";
+		}
 	    }
 
 	} catch (Exception e) {
 	    Common.log(new Status(IStatus.WARNING, Const.CORE_PLUGIN_ID, "parsing of upload recipe failed", e)); //$NON-NLS-1$
 	}
+	setBuildEnvironmentVariable(contribEnv, confDesc, "JANTJE.OBJCOPY", objcopyCommand);
 
 	// link build.core to jantje.build.core
 	setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_BUILD_CORE,