Skip to content

Commit e819750

Browse files
committed
Linux testing use the same workarounds for build.usb string defines
1 parent 1debc34 commit e819750

File tree

1 file changed

+36
-24
lines changed

1 file changed

+36
-24
lines changed

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

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class WorkAround extends Const {
3838
// Each time this class is touched consider changing the String below to enforce
3939
// updates
4040
// for debugging I added the system time so the files get refresed at each run
41-
private static final String FIRST_SLOEBER_WORKAROUND_LINE = "#Sloeber created workaound file V1.01.test 13 ";
41+
private static final String FIRST_SLOEBER_WORKAROUND_LINE = "#Sloeber created workaound file V1.01.test 15 ";
4242
// + String.valueOf(System.currentTimeMillis());
4343

4444
/**
@@ -126,7 +126,7 @@ static File MakeBoardsSloeberTxt(File requestedFileToWorkAround) {
126126
String correctPROD = " \"-DUSB_PRODUCT=\\\"{build.usb_product}\\\"\" ";
127127
String correctBOARD = " \"-DARDUINO_BOARD=\\\"{build.board}\\\"\" ";
128128

129-
if (SystemUtils.IS_OS_WINDOWS) {
129+
// if (SystemUtils.IS_OS_WINDOWS) {
130130
// replace FI circuitplay32u4cat.build.usb_manufacturer="Adafruit"
131131
// with circuitplay32u4cat.build.usb_manufacturer=Adafruit
132132
boardsTXT = boardsTXT.replaceAll("(\\S+\\.build\\.usb\\S+)=\\\"(.+)\\\"", "$1=$2");
@@ -136,11 +136,11 @@ static File MakeBoardsSloeberTxt(File requestedFileToWorkAround) {
136136
boardsTXT = boardsTXT.replaceAll(" ['\\\"]?(-DMBEDTLS_\\S+)=\\\\?\"(mbedtls\\S+?)\\\\?\\\"[\"']? ",
137137
" \\\"$1=\\\\\\\"$2\\\\\\\"\\\" ");
138138

139-
} else {
140-
correctMAN = " '-DUSB_MANUFACTURER=\"{build.usb_manufacturer}\"' ";
141-
correctPROD = " '-DUSB_PRODUCT=\"{build.usb_product}\" '";
142-
correctBOARD = " '-DARDUINO_BOARD=\"{build.board}\"' ";
143-
}
139+
// } else {
140+
// correctMAN = " '-DUSB_MANUFACTURER=\"{build.usb_manufacturer}\"' ";
141+
// correctPROD = " '-DUSB_PRODUCT=\"{build.usb_product}\" '";
142+
// correctBOARD = " '-DARDUINO_BOARD=\"{build.board}\"' ";
143+
// }
144144
// some providers put -DUSB_PRODUCT={build.usb_product} in boards.txt
145145
boardsTXT = boardsTXT.replace(" \"-DUSB_MANUFACTURER={build.usb_manufacturer}\" ", correctMAN);
146146
boardsTXT = boardsTXT.replace(" \"-DUSB_PRODUCT={build.usb_product}\" ", correctPROD);
@@ -284,24 +284,36 @@ static File MakePlatformSloeberTXT(File requestedFileToWorkAround) {
284284
platformTXT = platformTXT.replaceAll("\"?(-DMBEDTLS_\\S+)=\\\\?\"(mbedtls\\S+)\"\\\\?\"*",
285285
"\"$1=\\\\\"$2\\\\\"\"");
286286

287-
// Sometimes "-DUSB_MANUFACTURER={build.usb_manufacturer}"
288-
// "-DUSB_PRODUCT={build.usb_product}"
289-
// is used fi LinKit smart
290-
platformTXT = platformTXT.replace("\"-DUSB_MANUFACTURER={build.usb_manufacturer}\"",
291-
"\"-DUSB_MANUFACTURER=\\\"{build.usb_manufacturer}\\\"\"");
292-
platformTXT = platformTXT.replace("\"-DUSB_PRODUCT={build.usb_product}\"",
293-
"\"-DUSB_PRODUCT=\\\"{build.usb_product}\\\"\"");
294-
platformTXT = platformTXT.replace(" -DARDUINO_BOARD=\"{build.board}\" ",
295-
" \"-DARDUINO_BOARD=\\\"{build.board}\\\"\" ");
296-
297-
} else {
298-
platformTXT = platformTXT.replace(" -DUSB_MANUFACTURER={build.usb_manufacturer} ",
299-
" '-DUSB_MANUFACTURER=\"{build.usb_manufacturer}\"' ");
300-
platformTXT = platformTXT.replace(" -DUSB_PRODUCT={build.usb_product} ",
301-
" '-DUSB_PRODUCT=\"{build.usb_product}\" '");
302-
platformTXT = platformTXT.replace(" -DARDUINO_BOARD=\"{build.board}\" ",
303-
" '-DARDUINO_BOARD=\"{build.board}\"' ");
287+
// // Sometimes "-DUSB_MANUFACTURER={build.usb_manufacturer}"
288+
// // "-DUSB_PRODUCT={build.usb_product}"
289+
// // is used fi LinKit smart
290+
// platformTXT = platformTXT.replace("\"-DUSB_MANUFACTURER={build.usb_manufacturer}\"",
291+
// "\"-DUSB_MANUFACTURER=\\\"{build.usb_manufacturer}\\\"\"");
292+
// platformTXT = platformTXT.replace("\"-DUSB_PRODUCT={build.usb_product}\"",
293+
// "\"-DUSB_PRODUCT=\\\"{build.usb_product}\\\"\"");
294+
// platformTXT = platformTXT.replace(" -DARDUINO_BOARD=\"{build.board}\" ",
295+
// " \"-DARDUINO_BOARD=\\\"{build.board}\\\"\" ");
296+
//
297+
// } else {
298+
// platformTXT = platformTXT.replace(" -DUSB_MANUFACTURER={build.usb_manufacturer} ",
299+
// " '-DUSB_MANUFACTURER=\"{build.usb_manufacturer}\"' ");
300+
// platformTXT = platformTXT.replace(" -DUSB_PRODUCT={build.usb_product} ",
301+
// " '-DUSB_PRODUCT=\"{build.usb_product}\" '");
302+
// platformTXT = platformTXT.replace(" -DARDUINO_BOARD=\"{build.board}\" ",
303+
// " '-DARDUINO_BOARD=\"{build.board}\"' ");
304304
}
305+
306+
// Sometimes "-DUSB_MANUFACTURER={build.usb_manufacturer}"
307+
// "-DUSB_PRODUCT={build.usb_product}"
308+
// is used fi LinKit smart
309+
platformTXT = platformTXT.replace("\"-DUSB_MANUFACTURER={build.usb_manufacturer}\"",
310+
"\"-DUSB_MANUFACTURER=\\\"{build.usb_manufacturer}\\\"\"");
311+
platformTXT = platformTXT.replace("\"-DUSB_PRODUCT={build.usb_product}\"",
312+
"\"-DUSB_PRODUCT=\\\"{build.usb_product}\\\"\"");
313+
platformTXT = platformTXT.replace(" -DARDUINO_BOARD=\"{build.board}\" ",
314+
" \"-DARDUINO_BOARD=\\\"{build.board}\\\"\" ");
315+
316+
305317
platformTXT = platformTXT.replace("{", "${");
306318
// Arduino zero openocd script uses { as parameter delimiter for program
307319
platformTXT = platformTXT.replace("program ${${", "program {${");

0 commit comments

Comments
 (0)