When compiling libraries, don't use a shared accumulator for all libraries

Fixes #36

Signed-off-by: Federico Fissore <[email protected]>

Author: Federico Fissore

src/arduino.cc/builder/phases/libraries_builder.go

@@ -67,27 +67,28 @@ func (s *LibrariesBuilder) Run(context map[string]interface{}) error {
 }
 
 func compileLibraries(libraries []*types.Library, buildPath string, buildProperties map[string]string, includes []string, verbose bool, warningsLevel string, logger i18n.Logger) ([]string, error) {
-	var err error
-	var objectFiles []string
+	objectFiles := []string{}
 	for _, library := range libraries {
-		objectFiles, err = compileLibrary(objectFiles, library, buildPath, buildProperties, includes, verbose, warningsLevel, logger)
+		libraryObjectFiles, err := compileLibrary(library, buildPath, buildProperties, includes, verbose, warningsLevel, logger)
 		if err != nil {
 			return nil, utils.WrapError(err)
 		}
+		objectFiles = append(objectFiles, libraryObjectFiles...)
 	}
 
 	return objectFiles, nil
 
 }
 
-func compileLibrary(objectFiles []string, library *types.Library, buildPath string, buildProperties map[string]string, includes []string, verbose bool, warningsLevel string, logger i18n.Logger) ([]string, error) {
+func compileLibrary(library *types.Library, buildPath string, buildProperties map[string]string, includes []string, verbose bool, warningsLevel string, logger i18n.Logger) ([]string, error) {
 	libraryBuildPath := filepath.Join(buildPath, library.Name)
 
 	err := os.MkdirAll(libraryBuildPath, os.FileMode(0755))
 	if err != nil {
 		return nil, utils.WrapError(err)
 	}
 
+	objectFiles := []string{}
 	if library.Layout == types.LIBRARY_RECURSIVE {
 		objectFiles, err = builder_utils.CompileFilesRecursive(objectFiles, library.SrcFolder, libraryBuildPath, buildProperties, includes, verbose, warningsLevel, logger)
 		if err != nil {

src/arduino.cc/builder/test/builder_test.go

@@ -296,9 +296,9 @@ func TestBuilderALinkage(t *testing.T) {
 
 	context[constants.CTX_HARDWARE_FOLDERS] = []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "downloaded_board_manager_stuff"}
 	context[constants.CTX_TOOLS_FOLDERS] = []string{"downloaded_tools", "downloaded_board_manager_stuff"}
-	context[constants.CTX_LIBRARIES_FOLDERS] = []string{"libraries", "downloaded_libraries"}
-	context[constants.CTX_FQBN] = "arduino:avr:leonardo"
-	context[constants.CTX_SKETCH_LOCATION] = filepath.Join("downloaded_libraries", "HID", "examples", "NKROKeyboard", "NKROKeyboard.ino")
+	context[constants.CTX_LIBRARIES_FOLDERS] = []string{"downloaded_libraries"}
+	context[constants.CTX_FQBN] = "arduino:avr:robotControl"
+	context[constants.CTX_SKETCH_LOCATION] = filepath.Join("sketch9", "sketch.ino")
 	context[constants.CTX_BUILD_PROPERTIES_RUNTIME_IDE_VERSION] = "10600"
 	context[constants.CTX_VERBOSE] = true
 

src/arduino.cc/builder/test/downloaded_libraries/.gitignore

@@ -2,4 +2,5 @@ A*
 B*
 C*
 H*
+P*
 R*

src/arduino.cc/builder/test/helper_tools_downloader.go

@@ -130,7 +130,6 @@ func DownloadCoresAndToolsAndLibraries(t *testing.T) {
 		Library{Name: "Bridge", Version: "1.0.7"},
 		Library{Name: "CapacitiveSensor", Version: "0.5.0"},
 		Library{Name: "Robot IR Remote", Version: "1.0.2"},
-		//Library{Name: "HID", Version: "0.0.0", Url: "https://github.com/NicoHood/HID/archive/dev_2_4.zip"},
 	}
 
 	download(t, cores, boardsManagerCores, boardsManagerRedBearCores, tools, boardsManagerTools, boardsManagerRFduinoTools, libraries)

src/arduino.cc/builder/test/sketch9/sketch.ino

@@ -2,5 +2,5 @@
 #include <IRremote.h>
 #include <IRremoteInt.h>
 
-void setup {}
-void main {}
+void setup() {}
+void loop() {}