#661 on linux environment vars with . fail with ENVIRON + mawk issue

mawk does not like th \s for space and I didn't find a good solution so
I removed the space then numbers part of the regex
This should not be a problem because it is not a line selection criteria
but a way to select the second column
As the awk solution already assumed the interesting data is in the
second column we already lost this capability

Also the ENVIRON[XX.YY] did not work. Not in mawk nor in gawk though it
works fine on windows
Therefore I expanded the max sizes specified in the board.txt file in
the awk file

Author: jantje

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

@@ -906,17 +906,17 @@ 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 = "BEGIN {maximum_size=ENVIRON[\"upload.maximum_size\"]\n"
-                + "    maximum_data_size=ENVIRON[\"upload.maximum_data_size\"]}";
-        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);
         awkContent += "/" + regex + "/ {arduino_eeprom += $2 }\n";
         awkContent += "END { print \"\\n";
-        awkContent += Messages.sizeReportSketch;
+        String max = Common.getBuildEnvironmentVariable(confDesc, "upload.maximum_size", "10000");
+        awkContent += Messages.sizeReportSketch.replace("maximum_size", max);
         awkContent += "\\n";
-        awkContent += Messages.sizeReportData;
+        max = Common.getBuildEnvironmentVariable(confDesc, "upload.maximum_data_size", "10000");
+        awkContent += Messages.sizeReportData.replace("maximum_data_size", max);
         awkContent += "\\n";
         awkContent += "\"}";
 

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

@@ -43,7 +43,7 @@ public class WorkAround extends Const {
     // Each time this class is touched consider changing the String below to enforce
     // updates
     // for debugging I added the system time so the files get refresed at each run
-    private static final String FIRST_SLOEBER_WORKAROUND_LINE = "#Sloeber created workaound file V1.03.test 03 ";
+    private static final String FIRST_SLOEBER_WORKAROUND_LINE = "#Sloeber created workaound file V1.04.test 02 ";
     // + String.valueOf(System.currentTimeMillis());
 
     /**
@@ -366,6 +366,10 @@ private static String platformApplyStandardWorkArounds(String inPlatformTxt) {
         while (regex_macher.find()) {
             String origLine = platformTXT.substring(regex_macher.start(), regex_macher.end());
             String workedAroundLine = origLine.replace("(?:", "(");
+            String badSuffix="\\s+([0-9]+).*";
+            if(workedAroundLine.endsWith(badSuffix)) {
+            	workedAroundLine=workedAroundLine.substring(0, workedAroundLine.length()-badSuffix.length());
+            }
             if (!origLine.equals(workedAroundLine)) {
                 replaceInfo.put(origLine, workedAroundLine);
             }