From f66338236329eef2d2db3b50e2ff6e13851a2b32 Mon Sep 17 00:00:00 2001
From: Doug Schaefer <dschaefer@blackberry.com>
Date: Sun, 10 Jul 2016 09:51:57 -0400
Subject: [PATCH] Bug 497442 Install libraries in versioned directories.

To be consistent with platforms and to avoid issues with deleting
directories on Windows.

Change-Id: I9284413e8d864bdd49b9f8a0b171bc2d5af719f1
---
 .../eclipse/cdt/arduino/core/internal/board/ArduinoLibrary.java | 1 +
 .../eclipse/cdt/arduino/core/internal/board/ArduinoManager.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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 db11c42b44f..90ed3b1f0e9 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
@@ -190,6 +190,7 @@ public class ArduinoLibrary {
 	public Path getInstallPath() {
 		return installPath == null
 				? ArduinoPreferences.getArduinoHome().resolve("libraries").resolve(name.replaceAll("[ ()]", "_")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+						.resolve(version)
 				: installPath;
 	}
 
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoManager.java b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoManager.java
index 457d03d8608..6fe12c5d5c9 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoManager.java
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoManager.java
@@ -379,7 +379,7 @@ public class ArduinoManager {
 			Path librariesDir = ArduinoPreferences.getArduinoHome().resolve("libraries"); //$NON-NLS-1$
 			if (Files.isDirectory(librariesDir)) {
 				try {
-					Files.find(librariesDir, 2,
+					Files.find(librariesDir, 3,
 							(path, attrs) -> path.getFileName().toString().equals("library.properties")) //$NON-NLS-1$
 							.forEach(path -> {
 								try {