.S files of a sketch were ignored. Fixes #74

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

Author: Federico Fissore

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

@@ -41,8 +41,8 @@ import (
 )
 
 var MAIN_FILE_VALID_EXTENSIONS = map[string]bool{".ino": true, ".pde": true}
-var ADDITIONAL_FILE_VALID_EXTENSIONS = map[string]bool{".h": true, ".c": true, ".hpp": true, ".cpp": true}
-var ADDITIONAL_FILE_VALID_EXTENSIONS_NO_HEADERS = map[string]bool{".c": true, ".cpp": true}
+var ADDITIONAL_FILE_VALID_EXTENSIONS = map[string]bool{".h": true, ".c": true, ".hpp": true, ".cpp": true, ".s": true}
+var ADDITIONAL_FILE_VALID_EXTENSIONS_NO_HEADERS = map[string]bool{".c": true, ".cpp": true, ".s": true}
 
 var LIBRARY_MANDATORY_PROPERTIES = []string{constants.LIBRARY_NAME, constants.LIBRARY_VERSION, constants.LIBRARY_AUTHOR, constants.LIBRARY_MAINTAINER}
 var LIBRARY_NOT_SO_MANDATORY_PROPERTIES = []string{constants.LIBRARY_SENTENCE, constants.LIBRARY_PARAGRAPH, constants.LIBRARY_URL}

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

@@ -78,11 +78,12 @@ func TestCopyOtherFiles(t *testing.T) {
 
 	files, err1 := gohasissues.ReadDir(filepath.Join(buildPath, constants.FOLDER_SKETCH))
 	NoError(t, err1)
-	require.Equal(t, 2, len(files))
+	require.Equal(t, 3, len(files))
 
 	sort.Sort(ByFileInfoName(files))
 	require.Equal(t, "header.h", files[0].Name())
-	require.Equal(t, "subfolder", files[1].Name())
+	require.Equal(t, "s_file.S", files[1].Name())
+	require.Equal(t, "subfolder", files[2].Name())
 
 	files, err1 = gohasissues.ReadDir(filepath.Join(buildPath, constants.FOLDER_SKETCH, "subfolder"))
 	NoError(t, err1)

Diff for: src/arduino.cc/builder/test/sketch1/s_file.S

@@ -95,9 +95,10 @@ func TestLoadSketch(t *testing.T) {
 	require.Contains(t, sketch.OtherSketchFiles[0].Name, "old.pde")
 	require.Contains(t, sketch.OtherSketchFiles[1].Name, "other.ino")
 
-	require.Equal(t, 2, len(sketch.AdditionalFiles))
+	require.Equal(t, 3, len(sketch.AdditionalFiles))
 	require.Contains(t, sketch.AdditionalFiles[0].Name, "header.h")
-	require.Contains(t, sketch.AdditionalFiles[1].Name, "helper.h")
+	require.Contains(t, sketch.AdditionalFiles[1].Name, "s_file.S")
+	require.Contains(t, sketch.AdditionalFiles[2].Name, "helper.h")
 }
 
 func TestFailToLoadSketchFromFolder(t *testing.T) {