Remove Compiler.[recursive]CompileFilesInFolder

Since Compiler.compileFiles already knows how to recursively compile
files, it seems pointless to keep these around. Because compileFiles
uses a one-off recursion to list files to compile at the start, it has
to be slightly smarter about creating directories recursively when
needed and needs to fiddle with the filenames a bit (so that the
directory structure within a new-style library is maintained in the
build directory), but those are only minor changes to compileFiles.

Author: matthijskooijman

Diff for: app/src/processing/app/debug/Compiler.java

@@ -250,13 +250,15 @@ private List<File> compileFiles(File outputPath, File sourcePath,
       throws RunnerException {
     List<File> objectPaths = new ArrayList<File>();
     for (File file : sourceFiles) {
-      File objectFile = new File(outputPath, file.getName() + ".o");
-      File dependFile = new File(outputPath, file.getName() + ".d");
+      String relative = FileUtils.relativeSubPath(sourcePath, file);
+      File objectFile = new File(outputPath, relative + ".o");
+      File dependFile = new File(outputPath, relative + ".d");
       objectPaths.add(objectFile);
 
       if (isAlreadyCompiled(file, objectFile, dependFile, prefs))
         continue;
 
+      createFolder(objectFile.getParentFile());
       String[] cmd;
       if (FileUtils.hasExtension(file, "s")) {
         cmd = getCommandCompilerS(includeFolders, file, objectFile);
@@ -599,7 +601,7 @@ private String[] getCommandCompilerCPP(List<File> includeFolders,
   private void createFolder(File folder) throws RunnerException {
     if (folder.isDirectory())
       return;
-    if (!folder.mkdir())
+    if (!folder.mkdirs())
       throw new RunnerException("Couldn't create: " + folder);
   }
 
@@ -625,7 +627,7 @@ private void compileLibrary(Library lib, List<File> includeFolders)
     if (lib.useRecursion()) {
       // libBuildFolder == {build.path}/LibName
       // libFolder      == {lib.path}/src
-      recursiveCompileFilesInFolder(libBuildFolder, libFolder, includeFolders);
+      objectFiles.addAll(compileFiles(libBuildFolder, libFolder, true, includeFolders));
 
     } else {
       // libFolder          == {lib.path}/
@@ -636,29 +638,15 @@ private void compileLibrary(Library lib, List<File> includeFolders)
       File utilityBuildFolder = new File(libBuildFolder, "utility");
 
       includeFolders.add(utilityFolder);
-      compileFilesInFolder(libBuildFolder, libFolder, includeFolders);
+      objectFiles.addAll(compileFiles(libBuildFolder, libFolder, false, includeFolders));
       if (utilityFolder.isDirectory())
-        compileFilesInFolder(utilityBuildFolder, utilityFolder, includeFolders);
+        objectFiles.addAll(compileFiles(utilityBuildFolder, utilityFolder, false, includeFolders));
 
       // other libraries should not see this library's utility/ folder
       includeFolders.remove(utilityFolder);
     }
   }
 
-  private void recursiveCompileFilesInFolder(File srcBuildFolder, File srcFolder, List<File> includeFolders) throws RunnerException {
-    compileFilesInFolder(srcBuildFolder, srcFolder, includeFolders);
-    for (File subFolder : srcFolder.listFiles(new OnlyDirs())) {
-      File subBuildFolder = new File(srcBuildFolder, subFolder.getName());
-      recursiveCompileFilesInFolder(subBuildFolder, subFolder, includeFolders);
-    }
-  }
-
-  private void compileFilesInFolder(File buildFolder, File srcFolder, List<File> includeFolders) throws RunnerException {
-    createFolder(buildFolder);
-    List<File> objects = compileFiles(buildFolder, srcFolder, false, includeFolders);
-    objectFiles.addAll(objects);
-  }
-
   // 3. compile the core, outputting .o files to <buildPath> and then
   // collecting them into the core.a library file.
   // Also compiles the variant (if it supplies actual source files),