Merge branch 'master' of https://github.com/Sloeber/arduino-eclipse-plugin.git

jan · jan · commit da4ffc7d7745 · 2020-04-23T13:57:12.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ script:
   - sh -c "if $TRAVIS_SECURE_ENV_VARS; then echo Travis SECURE available -- Deploy; else echo Travis SECURE NOT available --  Verify; fi"
 
   #Execute the maven commands depending on SECURE availabilty and print the elapsed time out periodically.
-  - sh -c "if $TRAVIS_SECURE_ENV_VARS; then ./travis_exec_and_print_time.sh 'mvn deploy -Dtest=RegressionTest  --quiet --settings settings.xml'; else ./travis_exec_and_print_time.sh 'mvn verify -Dtest=RegressionTest --quiet --settings settings.xml'; fi"
+  - sh -c "if $TRAVIS_SECURE_ENV_VARS; then ./travis_exec_and_print_time.sh 'mvn verify -Dtest=RegressionTest  --quiet --settings settings.xml'; else ./travis_exec_and_print_time.sh 'mvn verify -Dtest=RegressionTest --quiet --settings settings.xml'; fi"
 
 #Several usernames and passwords/tokens are required for deployment.
 #When testing on your local/remote setup then you need to set/export env. variables:
diff --git a/io.sloeber.core/src/io/sloeber/core/managers/ArduinoPlatform.java b/io.sloeber.core/src/io/sloeber/core/managers/ArduinoPlatform.java
@@ -152,6 +152,7 @@ public IStatus remove(IProgressMonitor monitor) {
 	public IStatus install(IProgressMonitor monitor) {
 		// Check if we're installed already
 		if (isInstalled()) {
+			System.out.println("reusing platform "+name + " "+architecture +"("+version+")");
 			return Status.OK_STATUS;
 		}
 
diff --git a/io.sloeber.core/src/io/sloeber/core/managers/WorkAround.java b/io.sloeber.core/src/io/sloeber/core/managers/WorkAround.java
@@ -19,32 +19,30 @@
 import io.sloeber.core.tools.Version;
 
 /**
- * A class to apply workarounds to installed packages
- * workaround are done after installation
- * at usage of boards.txt file
- * at usage of platform.txt file
+ * A class to apply workarounds to installed packages workaround are done after
+ * installation at usage of boards.txt file at usage of platform.txt file
  * 
- * The first line of the worked around files contain a key
- * A newer version of sloeber that has a different workaround shuld change the key
- * in this way the worked around files can be persisted and updated when needed
+ * The first line of the worked around files contain a key A newer version of
+ * sloeber that has a different workaround shuld change the key in this way the
+ * worked around files can be persisted and updated when needed
  * 
  * @author jan
  *
  */
 @SuppressWarnings("nls")
 public class WorkAround {
-	//Each time this class is touched consider  changing the String below to enforce updates
-	private static final String FIRST_SLOEBER_WORKAROUND_LINE = "#Sloeber created workaound file V1.00.test 3";
-
+	// Each time this class is touched consider changing the String below to enforce
+	// updates
+	private static final String FIRST_SLOEBER_WORKAROUND_LINE = "#Sloeber created workaound file V1.00.test 4";
 
 	/**
-	 * workarounds done at installation time.
-	 * I try to keep those at a minimum but none platform.txt and boards.txt
-	 * workarounds need to be doine during install time
+	 * workarounds done at installation time. I try to keep those at a minimum but
+	 * none platform.txt and boards.txt workarounds need to be doine during install
+	 * time
 	 * 
 	 * @param platform
 	 */
-	static public void applyKnownWorkArounds(ArduinoPlatform platform) {
+	static synchronized public void applyKnownWorkArounds(ArduinoPlatform platform) {
 
 		/*
 		 * for STM32 V1.8 and later #include "SrcWrapper.h" to Arduino.h remove the
@@ -70,105 +68,101 @@ static public void applyKnownWorkArounds(ArduinoPlatform platform) {
 		MakeBoardsSloeberTxt(platform.getBoardsFile());
 
 	}
-	
-	
+
 	/**
 	 * create a workedaround boards.txt and return that filz
-	 *  
+	 * 
 	 * @param requestedFileToWorkAround
 	 * 
-	 * @return the worked around file or requestedFileToWorkAround is it does not exist or error
+	 * @return the worked around file or requestedFileToWorkAround is it does not
+	 *         exist or error
 	 */
-	static public File MakeBoardsSloeberTxt(File requestedFileToWorkAround) {
-		if(!requestedFileToWorkAround.exists()) {
+	static synchronized public File MakeBoardsSloeberTxt(File requestedFileToWorkAround) {
+		if (!requestedFileToWorkAround.exists()) {
 			return requestedFileToWorkAround;
 		}
-		String inFile=requestedFileToWorkAround.toString();
-		String actualFileToLoad=inFile.replace(Const.BOARDS_FILE_NAME,"boards.sloeber.txt");
-		if(inFile.equals(actualFileToLoad)) {
+		String inFile = requestedFileToWorkAround.toString();
+		String actualFileToLoad = inFile.replace(Const.BOARDS_FILE_NAME, "boards.sloeber.txt");
+		if (inFile.equals(actualFileToLoad)) {
 			Common.log(new Status(IStatus.ERROR, Activator.getId(),
 					"Boards.txt file is not recognized " + requestedFileToWorkAround.toString()));
 			return requestedFileToWorkAround;
 		}
-		File boardsSloeberTXT=new File(actualFileToLoad);
-		if(boardsSloeberTXT.exists()) {
-			//delete if outdated
+		File boardsSloeberTXT = new File(actualFileToLoad);
+		if (boardsSloeberTXT.exists()) {
+			// delete if outdated
 			String firstLine = null;
-			try(BufferedReader Buff = new BufferedReader(new FileReader(boardsSloeberTXT));) {
+			try (BufferedReader Buff = new BufferedReader(new FileReader(boardsSloeberTXT));) {
 				firstLine = Buff.readLine();
 			} catch (Exception e) {
-				//ignore and delete the file
-			} 
-			if(!FIRST_SLOEBER_WORKAROUND_LINE.equals(firstLine)) {
+				// ignore and delete the file
+			}
+			if (!FIRST_SLOEBER_WORKAROUND_LINE.equals(firstLine)) {
 				boardsSloeberTXT.delete();
 			}
 		}
-		if(!boardsSloeberTXT.exists()) {
-			if (requestedFileToWorkAround.exists()) {
-				try {
-					if (SystemUtils.IS_OS_WINDOWS) {
-						String boardsTXT = FIRST_SLOEBER_WORKAROUND_LINE+"\n";
-						boardsTXT += FileUtils.readFileToString(requestedFileToWorkAround, Charset.defaultCharset());
-						boardsTXT = boardsTXT.replace("\r\n", "\n");
-						
-
-						// replace FI circuitplay32u4cat.build.usb_manufacturer="Adafruit"
-						// with circuitplay32u4cat.build.usb_manufacturer=Adafruit
-						boardsTXT = boardsTXT.replaceAll("(\\S+\\.build\\.usb\\S+)=\\\"(.+)\\\"", "$1=$2");
-						
-
-						FileUtils.write(boardsSloeberTXT, boardsTXT, Charset.defaultCharset());
-					}
-				} catch (IOException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
+		if (!boardsSloeberTXT.exists()) {
+			try {
+				String boardsTXT = FIRST_SLOEBER_WORKAROUND_LINE + "\n";
+				boardsTXT += FileUtils.readFileToString(requestedFileToWorkAround, Charset.defaultCharset());
+				boardsTXT = boardsTXT.replace("\r\n", "\n");
+
+				if (SystemUtils.IS_OS_WINDOWS) {
+					// replace FI circuitplay32u4cat.build.usb_manufacturer="Adafruit"
+					// with circuitplay32u4cat.build.usb_manufacturer=Adafruit
+					boardsTXT = boardsTXT.replaceAll("(\\S+\\.build\\.usb\\S+)=\\\"(.+)\\\"", "$1=$2");
 				}
+				FileUtils.write(boardsSloeberTXT, boardsTXT, Charset.defaultCharset());
+			} catch (IOException e) {
+				Common.log(new Status(IStatus.WARNING, Activator.getId(),
+						"Failed to apply work arounds to " + requestedFileToWorkAround.toString(), e));
+				return requestedFileToWorkAround;
 			}
 		}
 		return boardsSloeberTXT;
 	}
-	
-	
+
 	/**
 	 * create a workedaround platform.txt and return that filz
-	 *  
+	 * 
 	 * @param requestedFileToWorkAround
 	 * 
-	 * @return the worked around file or requestedFileToWorkAround is it does not exist or error
+	 * @return the worked around file or requestedFileToWorkAround is it does not
+	 *         exist or error
 	 */
-	public static File MakePlatformSloeberTXT(File requestedFileToWorkAround) {
-		if(!requestedFileToWorkAround.exists()) {
+	public synchronized static File MakePlatformSloeberTXT(File requestedFileToWorkAround) {
+		if (!requestedFileToWorkAround.exists()) {
 			return requestedFileToWorkAround;
 		}
-		String inFile=requestedFileToWorkAround.toString();
-		String actualFileToLoad=inFile.replace(Const.PLATFORM_FILE_NAME,"platform.sloeber.txt");
-		if(inFile.equals(actualFileToLoad)) {
+		String inFile = requestedFileToWorkAround.toString();
+		String actualFileToLoad = inFile.replace(Const.PLATFORM_FILE_NAME, "platform.sloeber.txt");
+		if (inFile.equals(actualFileToLoad)) {
 			Common.log(new Status(IStatus.ERROR, Activator.getId(),
 					"platform.txt file is not recognized " + requestedFileToWorkAround.toString()));
 			return requestedFileToWorkAround;
 		}
-		File platformSloeberTXT=new File(actualFileToLoad);
-		if(platformSloeberTXT.exists()) {
-			//delete if outdated
+		File platformSloeberTXT = new File(actualFileToLoad);
+		if (platformSloeberTXT.exists()) {
+			// delete if outdated
 			String firstLine = null;
-			try(BufferedReader Buff = new BufferedReader(new FileReader(platformSloeberTXT));) {
+			try (BufferedReader Buff = new BufferedReader(new FileReader(platformSloeberTXT));) {
 				firstLine = Buff.readLine();
 			} catch (Exception e) {
-				//ignore and delete the file
-			} 
-			if(!FIRST_SLOEBER_WORKAROUND_LINE.equals(firstLine)) {
+				// ignore and delete the file
+			}
+			if (!FIRST_SLOEBER_WORKAROUND_LINE.equals(firstLine)) {
 				platformSloeberTXT.delete();
 			}
 		}
 		if (!platformSloeberTXT.exists()) {
 			try {
-				String platformTXT = FIRST_SLOEBER_WORKAROUND_LINE+"\n";
+				String platformTXT = FIRST_SLOEBER_WORKAROUND_LINE + "\n";
 				platformTXT += FileUtils.readFileToString(requestedFileToWorkAround, Charset.defaultCharset());
 				platformTXT = platformTXT.replace("\r\n", "\n");
-				
-				//Arduino treats core differently so we need to change the location of directly 
-				//referenced files this manifestates only in the combine recipe
-				int inCombineStartIndex=platformTXT.indexOf("\nrecipe.c.combine.pattern")+1;
+
+				// Arduino treats core differently so we need to change the location of directly
+				// referenced files this manifestates only in the combine recipe
+				int inCombineStartIndex = platformTXT.indexOf("\nrecipe.c.combine.pattern") + 1;
 				if (inCombineStartIndex > 0) {
 					int inCombineEndIndex = platformTXT.indexOf("\n", inCombineStartIndex) - 1;
 					if (inCombineEndIndex > 0) {
@@ -180,15 +174,14 @@ public static File MakePlatformSloeberTXT(File requestedFileToWorkAround) {
 					}
 				}
 
-
 				// workaround for infineon arm v1.4.0 overwriting the default to a wrong value
 				platformTXT = platformTXT.replace("\nbuild.core.path", "\n#line removed by Sloeber build.core.path");
 
-				Path platformTXTPath=  new Path (requestedFileToWorkAround.toString());
-				int totalSegments= platformTXTPath.segmentCount();
-				String platformVersion= platformTXTPath.segment(totalSegments-2);
-				String platformArchitecture= platformTXTPath.segment(totalSegments-3);
-				String platformName= platformTXTPath.segment(totalSegments-5);
+				Path platformTXTPath = new Path(requestedFileToWorkAround.toString());
+				int totalSegments = platformTXTPath.segmentCount();
+				String platformVersion = platformTXTPath.segment(totalSegments - 2);
+				String platformArchitecture = platformTXTPath.segment(totalSegments - 3);
+				String platformName = platformTXTPath.segment(totalSegments - 5);
 				if (Version.compare("1.8.0", platformVersion) != 1) {
 					if ("stm32".equals(platformArchitecture)) {
 						if ("STM32".equals(platformName)) {
@@ -198,30 +191,37 @@ public static File MakePlatformSloeberTXT(File requestedFileToWorkAround) {
 					}
 				}
 
-				
-				//for adafruit nfr
-				platformTXT = platformTXT.replace("-DARDUINO_BSP_VERSION=\"{version}\"", "\"-DARDUINO_BSP_VERSION=\\\"{version}\\\"\"");
-				
+				// for adafruit nfr
+				platformTXT = platformTXT.replace("-DARDUINO_BSP_VERSION=\"{version}\"",
+						"\"-DARDUINO_BSP_VERSION=\\\"{version}\\\"\"");
+
 				if (SystemUtils.IS_OS_WINDOWS) {
 					// replace FI '-DUSB_PRODUCT={build.usb_product}' with
 					// "-DUSB_PRODUCT=\"{build.usb_product}\""
 					platformTXT = platformTXT.replaceAll("\\'-D(\\S+)=\\{(\\S+)}\\'", "\"-D$1=\\\\\"{$2}\\\\\"\"");
-					
-					
-					//quoting fixes for embedutils
-					platformTXT = platformTXT.replaceAll("\"?(-DMBEDTLS_\\S+)=\\\\?\"(mbedtls\\S+)\"\\\\?\"*", 	"\"$1=\\\\\"$2\\\\\"\"");
-					
-					//Sometimes "-DUSB_MANUFACTURER={build.usb_manufacturer}" "-DUSB_PRODUCT={build.usb_product}"
-					//is used fi LinKit smart
-					platformTXT = platformTXT.replace("\"-DUSB_MANUFACTURER={build.usb_manufacturer}\"", 
+
+					// quoting fixes for embedutils
+					platformTXT = platformTXT.replaceAll("\"?(-DMBEDTLS_\\S+)=\\\\?\"(mbedtls\\S+)\"\\\\?\"*",
+							"\"$1=\\\\\"$2\\\\\"\"");
+
+					// Sometimes "-DUSB_MANUFACTURER={build.usb_manufacturer}"
+					// "-DUSB_PRODUCT={build.usb_product}"
+					// is used fi LinKit smart
+					platformTXT = platformTXT.replace("\"-DUSB_MANUFACTURER={build.usb_manufacturer}\"",
 							"\"-DUSB_MANUFACTURER=\\\"{build.usb_manufacturer}\\\"\"");
-					platformTXT = platformTXT.replace("\"-DUSB_PRODUCT={build.usb_product}\"", 
+					platformTXT = platformTXT.replace("\"-DUSB_PRODUCT={build.usb_product}\"",
 							"\"-DUSB_PRODUCT=\\\"{build.usb_product}\\\"\"");
-					platformTXT = platformTXT.replace(" -DARDUINO_BOARD=\"{build.board}\" ", 
+					platformTXT = platformTXT.replace(" -DARDUINO_BOARD=\"{build.board}\" ",
 							" \"-DARDUINO_BOARD=\\\"{build.board}\\\"\" ");
-			
 
-					
+				}
+				if(SystemUtils.IS_OS_LINUX) {
+					platformTXT = platformTXT.replace(" -DUSB_MANUFACTURER={build.usb_manufacturer} ",
+							" '-DUSB_MANUFACTURER=\"{build.usb_manufacturer}\"' ");
+					platformTXT = platformTXT.replace(" -DUSB_PRODUCT={build.usb_product} ",
+							" '-DUSB_PRODUCT=\"{build.usb_product}\" '");
+					platformTXT = platformTXT.replace(" -DARDUINO_BOARD=\"{build.board}\" ",
+							" '-DARDUINO_BOARD=\"{build.board}\"' ");
 				}
 				FileUtils.write(platformSloeberTXT, platformTXT, Charset.defaultCharset());
 			} catch (IOException e) {
diff --git a/io.sloeber.core/src/io/sloeber/core/tools/TxtFile.java b/io.sloeber.core/src/io/sloeber/core/tools/TxtFile.java
@@ -62,12 +62,21 @@ public TxtFile(File boardsFileName, boolean workAround) {
 
 		this.mLastLoadedTxtFile =boardsFileName;
 		File actuallyLoadedTxtFile = mLastLoadedTxtFile;
+		// If the file doesn't exist ignore it.
+		if (!boardsFileName.exists()) {
+			return ;
+		}
+
 		if(workAround) {
 			actuallyLoadedTxtFile =WorkAround.MakeBoardsSloeberTxt(boardsFileName);
 		}
-		// If the file doesn't exist ignore it.
-		if (!actuallyLoadedTxtFile.exists())
+		
+		if (!actuallyLoadedTxtFile.exists()) {
+			Common.log(new Status(IStatus.ERROR, Const.CORE_PLUGIN_ID,
+					"Worked around file " +actuallyLoadedTxtFile.toString() + " does not exist.")); //$NON-NLS-1$ //$NON-NLS-2$
 			return ;
+		}
+
 
 		this.fileContent.clear();
 
diff --git a/io.sloeber.tests/src/io/sloeber/core/CreateAndCompileDefaultInoOnAllBoardsTest.java b/io.sloeber.tests/src/io/sloeber/core/CreateAndCompileDefaultInoOnAllBoardsTest.java
@@ -269,20 +269,7 @@ public static Collection boards() {
         for (File curBoardFile : PackageManager.getAllBoardsFiles()) {
             // TOFIX these options should not be set here but in IBoard.getOptions
             Map<String, String> options = null;
-//            if (curBoardFile.contains("Jantje")) {
-//                // for jantjes boards as unit testing does not make a exe without the gdb lib
-//                options = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-//                options.put("type", "debug");
-//            } else if (curBoardFile.contains("avr_boot")) {
-//                // for avr_boot avr_boot_atmega328 to have variant
-//                options = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-//                options.put("pinout", "avrdevelopers");
-//            } else if (curBoardFile.contains("/tiny/hardware")) {
-//                // do not use ATtiny85 @ 128 KHz (watchdog oscillator; 1.8 V BOD)
-//                // fails in arduino IDE as well
-//                options = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-//                options.put("cpu", "attiny25at1");
-//            }
+            System.out.println("Adding boards of "+curBoardFile.toString() );
             boards.addAll(BoardDescriptor.makeBoardDescriptors(curBoardFile, options));
         }
         // to avoid warnings set the upload port to some value
diff --git a/io.sloeber.tests/src/io/sloeber/core/MySystem.java b/io.sloeber.tests/src/io/sloeber/core/MySystem.java
@@ -17,7 +17,7 @@ public class MySystem {
 	private static final String jantjesWindowsMachineHashKey = "1248215851";
 	//the one below is based on one mac address Fysiek adres (MAC):	C0-3F-D5-66-04-58 
 	private static final String jantjesWindowsMachineHashkeyAfterUpdate="139705674";
-	private static final String jantjesLinuxMachineHashKey = "-784776710";
+	private static final String jantjesLinuxMachineHashKey = "88937904";
 	private static final String jantjeWindowsMachineHashkeyAfterSecondUpdate="-441525448";
 
 	public static String getTeensyPlatform() {
@@ -27,7 +27,7 @@ public static String getTeensyPlatform() {
 		case jantjeWindowsMachineHashkeyAfterSecondUpdate:
 			return "E:\\arduino\\arduino-1.8.12 - teensy\\hardware\\teensy";
 		case jantjesLinuxMachineHashKey:
-			return "/home/jan/nas/linux/arduino/arduino-1.8.8-linux64/arduino-1.8.8/hardware/teensy";
+			return "/home/jan/tensyduino/arduino-1.8.12/hardware/teensy";
 		default:
 			return new String();
 		}
@@ -39,10 +39,19 @@ public static String getTeensyBoard_txt() {
 	public static MCUBoard[] getUploadBoards()  {
 		switch (Other.getSystemHash()) {
 		case jantjesLinuxMachineHashKey: {
-			MCUBoard[] boards = {   Teensy.teensypp2(),  ESP8266.wemosD1("COM21"),
-					Arduino.fried2016("COM26"), Arduino.yun("COM20"), Arduino.uno("COM6"),
-					Arduino.getMega2560Board("COM11"), Arduino.zeroProgrammingPort("COM14"), Arduino.due("COM8"),
-					Arduino.leonardo("COM31"), Arduino.arduino_101("COM15") };
+			MCUBoard[] boards = {   
+					Teensy.teensypp2("/dev/ttyACM0"),  
+					Arduino.leonardo("/dev/ttyS0"),   //werkt niet
+					Arduino.fried2016("/dev/ttyS0"), //werkt niet
+					Arduino.zeroNatviePort("/dev/ttyS0"), //werkt niet
+					Arduino.yun("COM20"), 
+					ESP8266.wemosD1("/dev/ttyUSB0"),
+					Arduino.arduino_101("COM15"),
+					Arduino.zeroProgrammingPort("COM14"), 
+					Arduino.getMega2560Board("COM11"), 
+					Arduino.dueprogramming("COM8"),
+					Arduino.uno("COM6"),
+					};
 			return boards;
 		}
 		case jantjesWindowsMachineHashKey: 
@@ -66,7 +75,7 @@ public static MCUBoard[] getUploadBoards()  {
 			return boards;
 		}
 		default:
-			fail("Boards for the system with haskey " + Other.getSystemHash() + "are not found");
+			fail("Boards for the system with haskey " + Other.getSystemHash() + " are not found");
 			return null;
 		}
 	}
diff --git a/io.sloeber.tests/src/io/sloeber/core/RegressionTest.java b/io.sloeber.tests/src/io/sloeber/core/RegressionTest.java

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,7 @@ public IStatus remove(IProgressMonitor monitor) {`
`152`	`152`	`public IStatus install(IProgressMonitor monitor) {`
`153`	`153`	`// Check if we're installed already`
`154`	`154`	`if (isInstalled()) {`
	`155`	`+ System.out.println("reusing platform "+name + " "+architecture +"("+version+")");`
`155`	`156`	`return Status.OK_STATUS;`
`156`	`157`	`}`
`157`	`158`