From 79285aa3f072833c91d9476e5da86b833362abb6 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Wed, 21 Oct 2015 20:38:51 -0400 Subject: [PATCH] Bug 480347 - Support utility folder for old Arduino libraries. Change-Id: Ib25783b1d2b5a94757e3273ae0a2ada543e5c7e7 --- .../cdt/arduino/core/internal/board/ArduinoLibrary.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoLibrary.java b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoLibrary.java index 6c90c0062d5..9c77d69996d 100644 --- a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoLibrary.java +++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoLibrary.java @@ -193,8 +193,12 @@ public class ArduinoLibrary { if (srcPath.toFile().isDirectory()) { return Collections.singletonList(srcPath); } else { - // TODO do I need the 'utility' directory? - return Collections.singletonList(installPath); + Path utilityPath = installPath.resolve("utility"); //$NON-NLS-1$ + if (utilityPath.toFile().isDirectory()) { + return Arrays.asList(installPath, utilityPath); + } else { + return Collections.singletonList(installPath); + } } }