arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-19 09:42:11 +03:00
Code Activity

Rolling back changes that added support for libraries in the user's directory, as it wasn't properly implemented. svn merge -c -589

Browse Source
This commit is contained in:
David A. Mellis
2009-05-30 09:06:19 +00:00
parent 2357f22387
commit 12773c014a
3 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/LibraryManager.java
View File

@ -34,7 +34,7 @@ import javax.swing.*;
*/
public class LibraryManager {
private File coreLibDir, userLibDir;
private File libDir;
private List libraries = new ArrayList();
private Target target;
@ -44,11 +44,9 @@ public class LibraryManager {
public LibraryManager() throws IOException
{
String userDir = System.getProperty("user.dir") + File.separator;
coreLibDir = new File(
libDir = new File(
((!Base.isMacOS()) ? "" : userDir) + "hardware" + File.separator +
"libraries");
userLibDir =
new File(Sketchbook.getSketchbookPath() + File.separator + "libraries");
target = new Target(
System.getProperty("user.dir") + File.separator + "hardware" +
File.separator + "cores",
@ -72,15 +70,9 @@ public class LibraryManager {
}
};
libraries.clear();
File[] userLibs = userLibDir.listFiles(onlyDirs);
if (userLibs != null) {
for(int i = 0; i < userLibs.length; ++i){
libraries.add(new Library(this, userLibs[i]));
}
}
File[] coreLibs = coreLibDir.listFiles(onlyDirs);
for(int i = 0; i < coreLibs.length; ++i){
libraries.add(new Library(this, coreLibs[i]));
File[] libs = libDir.listFiles(onlyDirs);
for(int i = 0; i < libs.length; ++i){
libraries.add(new Library(this, libs[i]));
}
}