Simplify Compiler.compileFiles

Instead of doing three passes over the filesystem to collect source
files, it now does a single pass (using the newly introduced
FileUtils.listFiles) and later splits between .S, .c and .cpp files.
This allows sharing more code between the three file types and allows
removing Compiler.findFilesInFolder.

Additionally, this splits compileFiles into a version that compiles all
files in a folder and one that only compiles selected files. This
prepares for later refactoring of the Library class.

This has the side-effect of calling isAlreadyCompiled for .S files as
well (which didn't happen previously). However, since the assembler
command does not produce any .d files, .S files are still always
recompiled, just like before.

Finally, this has the side effect of handling file extensions in a case
insensitive manner during compilation (instead of just during load),
which means that e.g. .CPP files are not just loaded, but also compiled.

Author: matthijskooijman

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

@@ -240,35 +240,35 @@ private PreferencesMap createBuildPreferences(String _buildPath,
   private List<File> compileFiles(File outputPath, File sourcePath,
                                   boolean recurse, List<File> includeFolders)
       throws RunnerException {
-    List<File> sSources = findFilesInFolder(sourcePath, "S", recurse);
-    List<File> cSources = findFilesInFolder(sourcePath, "c", recurse);
-    List<File> cppSources = findFilesInFolder(sourcePath, "cpp", recurse);
-    List<File> objectPaths = new ArrayList<File>();
+    List<File> sourceFiles = FileUtils.listFiles(sourcePath, recurse, "s", "c", "cpp");
+    return compileFiles(outputPath, sourcePath, sourceFiles, includeFolders);
 
-    for (File file : sSources) {
-      File objectFile = new File(outputPath, file.getName() + ".o");
-      objectPaths.add(objectFile);
-      String[] cmd = getCommandCompilerS(includeFolders, file, objectFile);
-      execAsynchronously(cmd);
-    }
- 		
-    for (File file : cSources) {
-      File objectFile = new File(outputPath, file.getName() + ".o");
-      File dependFile = new File(outputPath, file.getName() + ".d");
-      objectPaths.add(objectFile);
-      if (isAlreadyCompiled(file, objectFile, dependFile, prefs))
-        continue;
-      String[] cmd = getCommandCompilerC(includeFolders, file, objectFile);
-      execAsynchronously(cmd);
-    }
+  }
 
-    for (File file : cppSources) {
+  private List<File> compileFiles(File outputPath, File sourcePath,
+                                  List<File> sourceFiles, List<File> includeFolders)
+      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");
       objectPaths.add(objectFile);
+
       if (isAlreadyCompiled(file, objectFile, dependFile, prefs))
         continue;
-      String[] cmd = getCommandCompilerCPP(includeFolders, file, objectFile);
+
+      String[] cmd;
+      if (FileUtils.hasExtension(file, "s")) {
+        cmd = getCommandCompilerS(includeFolders, file, objectFile);
+      } else if (FileUtils.hasExtension(file, "c")) {
+        cmd = getCommandCompilerC(includeFolders, file, objectFile);
+      } else if (FileUtils.hasExtension(file, "cpp")) {
+        cmd = getCommandCompilerCPP(includeFolders, file, objectFile);
+      } else {
+        // This should not be possible...
+        throw new RunnerException("Unknown source file extension: " + file.getName());
+      }
+
       execAsynchronously(cmd);
     }
 
@@ -603,35 +603,6 @@ private void createFolder(File folder) throws RunnerException {
       throw new RunnerException("Couldn't create: " + folder);
   }
 
-  static public List<File> findFilesInFolder(File folder, String extension,
-                                             boolean recurse) {
-    List<File> files = new ArrayList<File>();
-
-    if (FileUtils.isSCCSOrHiddenFile(folder)) {
-      return files;
-    }
-
-    File[] listFiles = folder.listFiles();
-    if (listFiles == null) {
-      return files;
-    }
-
-    for (File file : listFiles) {
-      if (FileUtils.isSCCSOrHiddenFile(file)) {
-        continue; // skip hidden files
-      }
-
-      if (file.getName().endsWith("." + extension))
-        files.add(file);
-
-      if (recurse && file.isDirectory()) {
-        files.addAll(findFilesInFolder(file, extension, true));
-      }
-    }
-
-    return files;
-  }
-  
   // 1. compile the sketch (already in the buildPath)
   void compileSketch(List<File> includeFolders) throws RunnerException {
     File buildPath = prefs.getFile("build.path");
@@ -666,7 +637,8 @@ private void compileLibrary(Library lib, List<File> includeFolders)
 
       includeFolders.add(utilityFolder);
       compileFilesInFolder(libBuildFolder, libFolder, includeFolders);
-      compileFilesInFolder(utilityBuildFolder, utilityFolder, includeFolders);
+      if (utilityFolder.isDirectory())
+        compileFilesInFolder(utilityBuildFolder, utilityFolder, includeFolders);
 
       // other libraries should not see this library's utility/ folder
       includeFolders.remove(utilityFolder);