Sketch sources files were recursively copied BUT not compiled. See

arduino/Arduino#1004 (comment)

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

Author: Federico Fissore

Diff for: src/arduino.cc/builder/phases/sketch_builder.go

@@ -54,7 +54,7 @@ func (s *SketchBuilder) Run(context map[string]interface{}) error {
 	}
 
 	var objectFiles []string
-	objectFiles, err = builder_utils.CompileFiles(objectFiles, sketchBuildPath, false, sketchBuildPath, buildProperties, includes, verbose, warningsLevel, logger)
+	objectFiles, err = builder_utils.CompileFiles(objectFiles, sketchBuildPath, true, sketchBuildPath, buildProperties, includes, verbose, warningsLevel, logger)
 	if err != nil {
 		return utils.WrapError(err)
 	}

Diff for: src/arduino.cc/builder/test/builder_test.go

@@ -313,3 +313,24 @@ func TestBuilderSketchWithOldLib(t *testing.T) {
 	err := command.Run(context)
 	NoError(t, err)
 }
+
+func TestBuilderSketchWithSubfolders(t *testing.T) {
+	DownloadCoresAndToolsAndLibraries(t)
+
+	context := make(map[string]interface{})
+
+	buildPath := SetupBuildPath(t, context)
+	defer os.RemoveAll(buildPath)
+
+	context[constants.CTX_HARDWARE_FOLDERS] = []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"}
+	context[constants.CTX_TOOLS_FOLDERS] = []string{"downloaded_tools"}
+	context[constants.CTX_FQBN] = "arduino:avr:uno"
+	context[constants.CTX_SKETCH_LOCATION] = filepath.Join("sketch_with_subfolders", "sketch_with_subfolders.ino")
+	context[constants.CTX_BUILT_IN_LIBRARIES_FOLDERS] = []string{"downloaded_libraries"}
+	context[constants.CTX_OTHER_LIBRARIES_FOLDERS] = []string{"libraries"}
+	context[constants.CTX_BUILD_PROPERTIES_RUNTIME_IDE_VERSION] = "10600"
+
+	command := builder.Builder{}
+	err := command.Run(context)
+	NoError(t, err)
+}

Diff for: src/arduino.cc/builder/test/sketch_loader_test.go

@@ -136,8 +136,9 @@ func TestLoadSketchFromFolder(t *testing.T) {
 
 	require.True(t, strings.Index(sketch.MainFile.Name, "sketch_with_subfolders.ino") != -1)
 
-	require.Equal(t, 1, len(sketch.AdditionalFiles))
+	require.Equal(t, 2, len(sketch.AdditionalFiles))
 	require.True(t, strings.Index(sketch.AdditionalFiles[0].Name, "other.cpp") != -1)
+	require.True(t, strings.Index(sketch.AdditionalFiles[1].Name, "other.h") != -1)
 }
 
 func TestLoadSketchWithBackup(t *testing.T) {

Diff for: src/arduino.cc/builder/test/sketch_with_subfolders/sketch_with_subfolders.ino

@@ -0,0 +1,10 @@
+#include "subfolder/other.h"
+
+MyClass myClass;
+
+void setup() {
+    myClass.init ( &Serial );
+}
+
+void loop() {
+}

Diff for: src/arduino.cc/builder/test/sketch_with_subfolders/subfolder/other.cpp

@@ -0,0 +1,10 @@
+#include <Arduino.h> // Arduino 1.0
+
+#include "other.h"
+
+MyClass::MyClass() {
+}
+
+void MyClass::init ( Stream *stream ) {
+    controllerStream = stream;
+}

Diff for: src/arduino.cc/builder/test/sketch_with_subfolders/subfolder/other.h

@@ -0,0 +1,12 @@
+#ifndef other__h
+#define other__h
+
+class MyClass {
+  public:
+    MyClass();
+    void init ( Stream *controllerStream );
+
+  private:
+    Stream *controllerStream;
+};
+#endif