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

11
app/Sketchbook.java
View File

@ -68,9 +68,6 @@ public class Sketchbook {
static File librariesFolder;
static String librariesPath;
static File userLibrariesFolder;
static String userLibrariesPath;
// maps imported packages to their library folder
static Hashtable importToLibraryTable = new Hashtable();
@ -134,14 +131,11 @@ public class Sketchbook {
//System.out.println("resetting sketchbook path");
File sketchbookFolder = Base.getDefaultSketchbookFolder();
//System.out.println("default is " + sketchbookFolder);
sketchbookPath = sketchbookFolder.getAbsolutePath();
Preferences.set("sketchbook.path", sketchbookPath);
Preferences.set("sketchbook.path",
sketchbookFolder.getAbsolutePath());
if (!sketchbookFolder.exists()) sketchbookFolder.mkdirs();
}
userLibrariesFolder = new File(sketchbookPath, "libraries");
userLibrariesPath = userLibrariesFolder.getAbsolutePath();
openMenu = new JMenu("Sketchbook");
popupMenu = new JMenu("Sketchbook");
importMenu = new JMenu("Import Library");
@ -392,7 +386,6 @@ public class Sketchbook {
if (addLibraries(importMenu, examplesFolder)) {
importMenu.addSeparator();
}
addLibraries(importMenu, userLibrariesFolder);
addLibraries(importMenu, librariesFolder);
//System.out.println("libraries cp is now " + librariesClassPath);