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

Added "Using library.." debugging message in verbose output.

Browse Source
This commit is contained in:
Cristian Maglie
2013-10-01 15:03:43 +02:00
parent a21d92e5c8
commit 2f38d1aaa5
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/processing/app/Sketch.java
View File

@ -1424,10 +1424,7 @@ public class Sketch {
importedLibraries = new LibraryList(); importedLibraries = new LibraryList();
for (String item : preprocessor.getExtraImports()) { for (String item : preprocessor.getExtraImports()) {
Library lib = Base.importToLibraryTable.get(item); Library lib = Base.importToLibraryTable.get(item);
//If needed can Debug libraryPath here
if (lib != null && !importedLibraries.contains(lib)) { if (lib != null && !importedLibraries.contains(lib)) {
importedLibraries.add(lib); importedLibraries.add(lib);
} }

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

@ -75,7 +75,7 @@ public class Compiler implements MessageConsumer {
String _primaryClassName, boolean _verbose) String _primaryClassName, boolean _verbose)
throws RunnerException { throws RunnerException {
sketch = _sketch; sketch = _sketch;
verbose = _verbose; verbose = _verbose || Preferences.getBoolean("build.verbose");
sketchIsCompiled = false; sketchIsCompiled = false;
objectFiles = new ArrayList<File>(); objectFiles = new ArrayList<File>();
@ -87,9 +87,16 @@ public class Compiler implements MessageConsumer {
includePaths.add(prefs.get("build.core.path")); includePaths.add(prefs.get("build.core.path"));
if (prefs.get("build.variant.path").length() != 0) if (prefs.get("build.variant.path").length() != 0)
includePaths.add(prefs.get("build.variant.path")); includePaths.add(prefs.get("build.variant.path"));
for (Library lib : sketch.getImportedLibraries()) for (Library lib : sketch.getImportedLibraries()) {
if (verbose)
System.out.println(I18n
.format(_("Using library {0} in folder: {1} {2}"), lib.getName(),
lib.getFolder(), lib.isPre15Lib() ? "(pre-1.5)" : ""));
for (File folder : lib.getSrcFolders(targetArch)) for (File folder : lib.getSrcFolders(targetArch))
includePaths.add(folder.getPath()); includePaths.add(folder.getPath());
}
if (verbose)
System.out.println();
// 1. compile the sketch (already in the buildPath) // 1. compile the sketch (already in the buildPath)
sketch.setCompilingProgress(30); sketch.setCompilingProgress(30);
@ -308,8 +315,8 @@ public class Compiler implements MessageConsumer {
} catch (Exception e) { } catch (Exception e) {
return false; // any error reading dep file = recompile it return false; // any error reading dep file = recompile it
} }
if (ret && (verbose || Preferences.getBoolean("build.verbose"))) { if (ret && verbose) {
System.out.println(" Using previously compiled: " + obj.getPath()); System.out.println(I18n.format(_("Using previously compiled file: {0}"), obj.getPath()));
} }
return ret; return ret;
} }
@ -334,7 +341,7 @@ public class Compiler implements MessageConsumer {
return; return;
int result = 0; int result = 0;
if (verbose || Preferences.getBoolean("build.verbose")) { if (verbose) {
for (String c : command) for (String c : command)
System.out.print(c + " "); System.out.print(c + " ");
System.out.println(); System.out.println();