Recursive library compilation

.gitignore

@@ -16,4 +16,7 @@ hardware/arduino/bootloaders/caterina_LUFA/.dep/
 .gitignore
 build/windows/work/
 build/linux/work/
+build/linux/dist/*.tar.gz
+build/linux/*.tgz
 test-bin
+*.iml

app/src/processing/app/Base.java

@@ -2716,11 +2716,6 @@ public void handleAddLibrary(Editor editor) {
         editor.statusError(mess);
         return;
       }
-      String[] headerFiles = headerListFromIncludePath(libFolder);
-      if (headerFiles == null || headerFiles.length == 0) {
-        editor.statusError(_("Not a valid library: no header files found"));
-        return;
-      }
 
       // copy folder
       File destinationFolder = new File(getSketchbookLibrariesFolder(), sourceFile.getName());

app/src/processing/app/Resources_it.properties

@@ -1,8 +1,8 @@
-# Italian translations for PACKAGE package.
-# Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Sara Gallo, Simone Majocchi, Michele Michielin <>, 2012.
-# 
+# Italian translations for PACKAGE package.
+# Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Sara Gallo, Simone Majocchi, Michele Michielin <>, 2012.
+# 
 !=Project-Id-Version\: PACKAGE VERSION\nReport-Msgid-Bugs-To\: \nPOT-Creation-Date\: 2012-03-29 10\:24-0400\nPO-Revision-Date\: 2012-04-08 12\:00+0200\nLast-Translator\: Sara Gallo, Simone Majocchi, Michele Michielin\nLanguage-Team\: Italian\nLanguage\: IT\nMIME-Version\: 1.0\nContent-Type\: text/plain; charset\=UTF-8\nContent-Transfer-Encoding\: 8bit\nPlural-Forms\: nplurals\=2; plural\=(n \!\= 1);\n
 
 #: Editor.java:366
@@ -221,7 +221,7 @@ OK=OK
 
 #: Editor.java:2100
 #, java-format
-The\ file\ "{0}"\ needs\ to\ be\ inside\na\ sketch\ folder\ named\ "{1}".\nCreate\ this\ folder,\ move\ the\ file,\ and\ continue?=Il file "{0}" deve essere all'interno\ndi una cartella sketch di nome "{1}".\nCreare questa cartella, spostare il file e continuare?
+The\ file\ "{0}"\ needs\ to\ be\ inside\na\ sketch\ folder\ named\ "{1}".\nCreate\ this\ folder,\ move\ the\ file,\ and\ continue?=Il file "{0}" deve essere all''interno\ndi una cartella sketch di nome "{1}".\nCreare questa cartella, spostare il file e continuare?
 
 #: Editor.java:2109
 Moving=Sto spostando

app/src/processing/app/debug/Compiler.java

@@ -40,6 +40,7 @@
 import processing.app.SketchCode;
 import processing.app.helpers.PreferencesMap;
 import processing.app.helpers.StringReplacer;
+import processing.app.helpers.filefilters.OnlyDirs;
 import processing.core.PApplet;
 
 public class Compiler implements MessageConsumer {
@@ -578,26 +579,47 @@ void compileSketch(List<String> includePaths) throws RunnerException {
   // 2. compile the libraries, outputting .o files to:
   // <buildPath>/<library>/
   void compileLibraries(List<String> includePaths) throws RunnerException {
-
+    File outputPath = new File(prefs.get("build.path"));
     for (File libraryFolder : sketch.getImportedLibraries()) {
-      String outputPath = prefs.get("build.path");
-      File outputFolder = new File(outputPath, libraryFolder.getName());
-      File utilityFolder = new File(libraryFolder, "utility");
-      createFolder(outputFolder);
-      // this library can use includes in its utility/ folder
-      includePaths.add(utilityFolder.getAbsolutePath());
-
-      objectFiles.addAll(compileFiles(outputFolder.getAbsolutePath(),
-                                      libraryFolder, false, includePaths));
-      outputFolder = new File(outputFolder, "utility");
-      createFolder(outputFolder);
-      objectFiles.addAll(compileFiles(outputFolder.getAbsolutePath(),
-                                      utilityFolder, false, includePaths));
-      // other libraries should not see this library's utility/ folder
-      includePaths.remove(includePaths.size() - 1);
+      if (new File(libraryFolder.getParentFile(), "library.properties").exists()) {
+        recursiveCompileLibrary(outputPath, libraryFolder, includePaths);
+      } else {
+        compileLibrary(outputPath, libraryFolder, includePaths);
+      }
     }
   }
-
+
+  private void recursiveCompileLibrary(File outputPath, File libraryFolder, List<String> includePaths) throws RunnerException {
+    File newOutputPath = compileFilesInFolder(outputPath, libraryFolder, includePaths);
+    for (File subFolder : libraryFolder.listFiles(new OnlyDirs())) {
+      recursiveCompileLibrary(newOutputPath, subFolder, includePaths);
+    }
+  }
+
+  private File compileFilesInFolder(File outputPath, File libraryFolder, List<String> includePaths) throws RunnerException {
+    File outputFolder = new File(outputPath, libraryFolder.getName());
+    createFolder(outputFolder);
+    objectFiles.addAll(compileFiles(outputFolder.getAbsolutePath(), libraryFolder, false, includePaths));
+    return outputFolder;
+  }
+
+  private void compileLibrary(File outputPath, File libraryFolder, List<String> includePaths) throws RunnerException {
+    File outputFolder = new File(outputPath, libraryFolder.getName());
+    File utilityFolder = new File(libraryFolder, "utility");
+    createFolder(outputFolder);
+    // this library can use includes in its utility/ folder
+    includePaths.add(utilityFolder.getAbsolutePath());
+
+    objectFiles.addAll(compileFiles(outputFolder.getAbsolutePath(),
+            libraryFolder, false, includePaths));
+    outputFolder = new File(outputFolder, "utility");
+    createFolder(outputFolder);
+    objectFiles.addAll(compileFiles(outputFolder.getAbsolutePath(),
+            utilityFolder, false, includePaths));
+    // other libraries should not see this library's utility/ folder
+    includePaths.remove(includePaths.size() - 1);
+  }
+
   // 3. compile the core, outputting .o files to <buildPath> and then
   // collecting them into the core.a library file.
   void compileCore()