Merge pull request #3303 from ffissore/object-files-in-subdirs

RFC > Compiler: core files in "core" subfolder, libraries in "libraries"

Author: ffissore

Diff for: arduino-core/src/processing/app/debug/Compiler.java

@@ -358,7 +358,11 @@ protected void size(PreferencesMap prefs) throws RunnerException {
    * @throws RunnerException Only if there's a problem. Only then.
    */
   public boolean compile(boolean _verbose, boolean _save) throws RunnerException, PreferencesMapException {
-    preprocess(prefs.get("build.path"));
+    File sketchBuildFolder = new File(prefs.get("build.path"), "sketch");
+    if (!sketchBuildFolder.exists() && !sketchBuildFolder.mkdirs()) {
+      throw new RunnerException("Unable to create folder " + sketchBuildFolder);
+    }
+    preprocess(sketchBuildFolder.getAbsolutePath());
 
     verbose = _verbose || PreferencesData.getBoolean("build.verbose");
     saveHex = _save;
@@ -410,7 +414,7 @@ public boolean compile(boolean _verbose, boolean _save) throws RunnerException,
 
     // 1. compile the sketch (already in the buildPath)
     progressListener.progress(20);
-    compileSketch(includeFolders);
+    compileSketch(includeFolders, sketchBuildFolder);
     sketchIsCompiled = true;
 
     runActions("hooks.sketch.postbuild", prefs);
@@ -485,6 +489,9 @@ public boolean compile(boolean _verbose, boolean _save) throws RunnerException,
   }
 
   private void adviseDuplicateLibraries() {
+    if (importedDuplicateHeaders == null) {
+      return;
+    }
     for (int i=0; i < importedDuplicateHeaders.size(); i++) {
       System.out.println(I18n.format(_("Multiple libraries were found for \"{0}\""),
         importedDuplicateHeaders.get(i)));
@@ -995,8 +1002,7 @@ static public List<File> findFilesInFolder(File folder, String extension,
   }
 
   // 1. compile the sketch (already in the buildPath)
-  void compileSketch(List<File> includeFolders) throws RunnerException, PreferencesMapException {
-    File buildPath = prefs.getFile("build.path");
+  void compileSketch(List<File> includeFolders, File buildPath) throws RunnerException, PreferencesMapException {
     objectFiles.addAll(compileFiles(buildPath, buildPath, false, includeFolders));
   }
 
@@ -1011,7 +1017,12 @@ void compileLibraries(List<File> includeFolders) throws RunnerException, Prefere
   private void compileLibrary(UserLibrary lib, List<File> includeFolders)
           throws RunnerException, PreferencesMapException {
     File libFolder = lib.getSrcFolder();
-    File libBuildFolder = prefs.getFile(("build.path"), lib.getName());
+    File librariesFolder = new File(prefs.getFile("build.path"), "libraries");
+    if (!librariesFolder.exists() && !librariesFolder.mkdirs()) {
+      throw new RunnerException("Unable to create folder " + librariesFolder);
+    }
+
+    File libBuildFolder = new File(librariesFolder, lib.getName());
 
     if (lib.useRecursion()) {
       // libBuildFolder == {build.path}/LibName
@@ -1058,7 +1069,10 @@ void compileCore()
 
     File coreFolder = prefs.getFile("build.core.path");
     File variantFolder = prefs.getFile("build.variant.path");
-    File buildFolder = prefs.getFile("build.path");
+    File buildFolder = new File(prefs.getFile("build.path"), "core");
+    if (!buildFolder.exists() && !buildFolder.mkdirs()) {
+      throw new RunnerException("Unable to create folder " + buildFolder);
+    }
 
     List<File> includeFolders = new ArrayList<File>();
     includeFolders.add(coreFolder); // include core path only
@@ -1108,6 +1122,7 @@ void compileCore()
         dict.put("ide_version", "" + BaseNoGui.REVISION);
         dict.put("archive_file", afile.getName());
         dict.put("object_file", file.getAbsolutePath());
+        dict.put("build.path", buildFolder.getAbsolutePath());
 
         String[] cmdArray;
         String cmd = prefs.getOrExcept("recipe.ar.pattern");
@@ -1144,7 +1159,7 @@ void compileLink()
     PreferencesMap dict = new PreferencesMap(prefs);
     String flags = dict.get("compiler.c.elf.flags") + optRelax;
     dict.put("compiler.c.elf.flags", flags);
-    dict.put("archive_file", "core.a");
+    dict.put("archive_file", new File("core", "core.a").getPath());
     dict.put("object_files", objectFileList);
     dict.put("ide_version", "" + BaseNoGui.REVISION);
 

Diff for: hardware/arduino/avr/platform.txt

@@ -65,18 +65,18 @@ recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.S.flags} -mmcu={b
 recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{build.path}/{archive_file}" "{object_file}"
 
 ## Combine gc-sections, archives, and objects
-recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mmcu={build.mcu} {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" {object_files} "{build.path}/{archive_file}" "-L{build.path}" -lm
+recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mmcu={build.mcu} {compiler.c.elf.extra_flags} -o "{build.path}/sketch/{build.project_name}.elf" {object_files} "{build.path}/{archive_file}" "-L{build.path}" -lm
 
 ## Create output files (.eep and .hex)
-recipe.objcopy.eep.pattern="{compiler.path}{compiler.objcopy.cmd}" {compiler.objcopy.eep.flags} {compiler.objcopy.eep.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.eep"
-recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.hex"
+recipe.objcopy.eep.pattern="{compiler.path}{compiler.objcopy.cmd}" {compiler.objcopy.eep.flags} {compiler.objcopy.eep.extra_flags} "{build.path}/sketch/{build.project_name}.elf" "{build.path}/sketch/{build.project_name}.eep"
+recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/sketch/{build.project_name}.elf" "{build.path}/sketch/{build.project_name}.hex"
 
 ## Save hex
 recipe.output.tmp_file={build.project_name}.hex
 recipe.output.save_file={build.project_name}.{build.variant}.hex
 
 ## Compute size
-recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"
+recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/sketch/{build.project_name}.elf"
 recipe.size.regex=^(?:\.text|\.data|\.bootloader)\s+([0-9]+).*
 recipe.size.regex.data=^(?:\.data|\.bss|\.noinit)\s+([0-9]+).*
 recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*

Diff for: hardware/arduino/sam/platform.txt

@@ -75,17 +75,17 @@ recipe.S.o.pattern="{compiler.path}{compiler.S.cmd}" {compiler.S.flags} -mcpu={b
 recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{build.path}/{archive_file}" "{object_file}"
 
 ## Combine gc-sections, archives, and objects
-recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mcpu={build.mcu} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group "{build.path}/syscalls_sam3.c.o" {object_files} "{build.variant.path}/{build.variant_system_lib}" "{build.path}/{archive_file}" -Wl,--end-group -lm -gcc
+recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mcpu={build.mcu} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.c.elf.extra_flags} -o "{build.path}/sketch/{build.project_name}.elf" "-L{build.path}" -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group "{build.path}/core/syscalls_sam3.c.o" {object_files} "{build.variant.path}/{build.variant_system_lib}" "{build.path}/{archive_file}" -Wl,--end-group -lm -gcc
 
 ## Create output (.bin file)
-recipe.objcopy.bin.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.bin"
+recipe.objcopy.bin.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/sketch/{build.project_name}.elf" "{build.path}/sketch/{build.project_name}.bin"
 
 ## Save hex
 recipe.output.tmp_file={build.project_name}.bin
 recipe.output.save_file={build.project_name}.{build.variant}.bin
 
 ## Compute size
-recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"
+recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/sketch/{build.project_name}.elf"
 recipe.size.regex=\.text\s+([0-9]+).*
 
 
@@ -98,5 +98,5 @@ tools.bossac.cmd.windows=bossac.exe
 
 tools.bossac.upload.params.verbose=-i -d
 tools.bossac.upload.params.quiet=
-tools.bossac.upload.pattern="{path}/{cmd}" {upload.verbose} --port={serial.port.file} -U {upload.native_usb} -e -w -v -b "{build.path}/{build.project_name}.bin" -R
+tools.bossac.upload.pattern="{path}/{cmd}" {upload.verbose} --port={serial.port.file} -U {upload.native_usb} -e -w -v -b "{build.path}/sketch/{build.project_name}.bin" -R
 

Diff for: hardware/platform.keys.rewrite.txt

@@ -15,3 +15,6 @@ new.3.compiler.path={runtime.tools.arm-none-eabi-gcc.path}/bin/
 old.4.tools.bossac.path={runtime.ide.path}/hardware/tools
 new.4.tools.bossac.path={runtime.tools.bossac.path}
 
+old.5.recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mcpu={build.mcu} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group "{build.path}/syscalls_sam3.c.o" {object_files} "{build.variant.path}/{build.variant_system_lib}" "{build.path}/{archive_file}" -Wl,--end-group -lm -gcc
+new.5.recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mcpu={build.mcu} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group "{build.path}/core/syscalls_sam3.c.o" {object_files} "{build.variant.path}/{build.variant_system_lib}" "{build.path}/{archive_file}" -Wl,--end-group -lm -gcc
+