|
45 | 45 | public class WorkAround {
|
46 | 46 | // Each time this class is touched consider changing the String below to enforce
|
47 | 47 | // updates
|
48 |
| - private static final String FIRST_SLOEBER_WORKAROUND_LINE = "#Sloeber created TXT file V3.00.test 22 "; |
| 48 | + private static final String FIRST_SLOEBER_WORKAROUND_LINE = "#Sloeber created TXT file V3.00.test 23 "; |
49 | 49 |
|
50 | 50 | private static Map<String, String> USB_replacers;
|
51 | 51 |
|
@@ -169,10 +169,8 @@ public static String boardsApplyWorkArounds(String inBoardsTXT) {
|
169 | 169 | boardsTXT = boardsTXT.replaceAll(" ['\\\"]?(-DMBEDTLS_\\S+)=\\\\?\"(mbedtls\\S+?)\\\\?\\\"[\"']? ",
|
170 | 170 | " \\\"$1=\\\\\\\"$2\\\\\\\"\\\" ");
|
171 | 171 |
|
172 |
| - if (isWindows) { |
173 |
| - for(Entry<String, String> curEntry:USB_replacers.entrySet()) { |
174 |
| - boardsTXT = boardsTXT.replace(curEntry.getKey(), curEntry.getValue()); |
175 |
| - } |
| 172 | + for (Entry<String, String> curEntry : USB_replacers.entrySet()) { |
| 173 | + boardsTXT = boardsTXT.replace(curEntry.getKey(), curEntry.getValue()); |
176 | 174 | }
|
177 | 175 | boardsTXT = boardsTXT.replace("{", "${");
|
178 | 176 | return boardsTXT;
|
@@ -476,10 +474,8 @@ private static String platformApplyStandardWorkArounds(String inPlatformTxt) {
|
476 | 474 | // "-DUSB_PRODUCT=\"{build.usb_product}\""
|
477 | 475 | // platformTXT = platformTXT.replaceAll("\\'-D(\\S+)=\\{(\\S+)}\\'",
|
478 | 476 | // "\"-D$1=\\\\\"{$2}\\\\\"\"");
|
479 |
| - if (isWindows) { |
480 |
| - for(Entry<String, String> curEntry:USB_replacers.entrySet()) { |
481 |
| - platformTXT = platformTXT.replace(curEntry.getKey(), curEntry.getValue()); |
482 |
| - } |
| 477 | + for (Entry<String, String> curEntry : USB_replacers.entrySet()) { |
| 478 | + platformTXT = platformTXT.replace(curEntry.getKey(), curEntry.getValue()); |
483 | 479 | }
|
484 | 480 |
|
485 | 481 | // quoting fixes for embedutils
|
|
0 commit comments