arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Code Activity

Factoring Library class, step 2: first try parsing library metadata

Browse Source
This commit is contained in:
Cristian Maglie
2013-02-11 18:11:52 +01:00
parent a2fc4332b9
commit aa2d0e0c3c
7 changed files with 207 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/processing/app/debug/Compiler.java
View File

@ -86,7 +86,7 @@ public class Compiler implements MessageConsumer {
if (prefs.get("build.variant.path").length() != 0)
includePaths.add(prefs.get("build.variant.path"));
for (Library lib : sketch.getImportedLibraries())
includePaths.add(lib.getRootFolder().getPath());
includePaths.add(lib.getSrcFolder().getPath());
// 1. compile the sketch (already in the buildPath)
sketch.setCompilingProgress(30);
@ -582,11 +582,11 @@ public class Compiler implements MessageConsumer {
void compileLibraries(List<String> includePaths) throws RunnerException {
File outputPath = new File(prefs.get("build.path"));
for (Library lib : sketch.getImportedLibraries()) {
File libFolder = lib.getRootFolder();
if (lib.isNewLib()) {
recursiveCompileLibrary(outputPath, libFolder, includePaths);
} else {
File libFolder = lib.getSrcFolder();
if (lib.isPre15Lib()) {
compileLibrary(outputPath, libFolder, includePaths);
} else {
recursiveCompileLibrary(outputPath, libFolder, includePaths);
}
}
}