Removing -MDD flag (if present) from preproc command line as it produces unwanted .d files

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

Author: Federico Fissore

Diff for: main.go

@@ -44,7 +44,7 @@ import (
 	"syscall"
 )
 
-const VERSION = "1.0.0-beta1"
+const VERSION = "1.0.0-beta2"
 
 type slice []string
 

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

@@ -45,6 +45,7 @@ const BUILD_PROPERTIES_BUILD_PROJECT_NAME = "build.project_name"
 const BUILD_PROPERTIES_BUILD_SYSTEM_PATH = "build.system.path"
 const BUILD_PROPERTIES_BUILD_VARIANT = "build.variant"
 const BUILD_PROPERTIES_BUILD_VARIANT_PATH = "build.variant.path"
+const BUILD_PROPERTIES_COMPILER_CPP_FLAGS = "compiler.cpp.flags"
 const BUILD_PROPERTIES_COMPILER_PATH = "compiler.path"
 const BUILD_PROPERTIES_COMPILER_WARNING_FLAGS = "compiler.warning_flags"
 const BUILD_PROPERTIES_INCLUDES = "includes"

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

@@ -52,6 +52,7 @@ func (s *GCCPreprocRunner) Run(context map[string]interface{}) error {
 	includes := context[constants.CTX_INCLUDE_FOLDERS].([]string)
 	includes = utils.Map(includes, utils.WrapWithHyphenI)
 	properties[constants.BUILD_PROPERTIES_INCLUDES] = strings.Join(includes, constants.SPACE)
+	removingHyphenMDDFlagFromGCCCommandLine(properties)
 
 	verbose := context[constants.CTX_VERBOSE].(bool)
 	logger := context[constants.CTX_LOGGER].(i18n.Logger)
@@ -64,3 +65,7 @@ func (s *GCCPreprocRunner) Run(context map[string]interface{}) error {
 
 	return nil
 }
+
+func removingHyphenMDDFlagFromGCCCommandLine(properties map[string]string) {
+	properties[constants.BUILD_PROPERTIES_COMPILER_CPP_FLAGS] = strings.Replace(properties[constants.BUILD_PROPERTIES_COMPILER_CPP_FLAGS], "-MMD", "", -1)
+}

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

@@ -32,14 +32,11 @@ package test
 import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
 	"fmt"
 	"github.com/go-errors/errors"
 	"github.com/stretchr/testify/assert"
 	"io/ioutil"
-	"os"
 	"path/filepath"
-	"strings"
 	"testing"
 )
 
@@ -77,19 +74,3 @@ func (s ByLibraryName) Swap(i, j int) {
 func (s ByLibraryName) Less(i, j int) bool {
 	return s[i].Name < s[j].Name
 }
-
-func DeleteAnyDotDFile() error {
-	files, err := ioutil.ReadDir(".")
-	if err != nil {
-		return utils.WrapError(err)
-	}
-	for _, file := range files {
-		if !file.IsDir() && strings.HasSuffix(file.Name(), ".d") {
-			err := os.Remove(file.Name())
-			if err != nil {
-				return utils.WrapError(err)
-			}
-		}
-	}
-	return nil
-}

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

@@ -79,8 +79,6 @@ func TestPrototypesAdderBridgeExample(t *testing.T) {
 
 	require.Equal(t, "#include <Arduino.h>\n#line 1\n", context[constants.CTX_INCLUDE_SECTION].(string))
 	require.Equal(t, "void setup();\nvoid loop();\nvoid process(YunClient client);\nvoid digitalCommand(YunClient client);\nvoid analogCommand(YunClient client);\nvoid modeCommand(YunClient client);\n#line 33\n", context[constants.CTX_PROTOTYPE_SECTION].(string))
-
-	NoError(t, DeleteAnyDotDFile())
 }
 
 func TestPrototypesAdderSketchWithIfDef(t *testing.T) {
@@ -125,8 +123,6 @@ func TestPrototypesAdderSketchWithIfDef(t *testing.T) {
 	preprocessed := string(bytes)
 
 	require.Equal(t, preprocessed, strings.Replace(context[constants.CTX_SOURCE].(string), "\r\n", "\n", -1))
-
-	NoError(t, DeleteAnyDotDFile())
 }
 
 func TestPrototypesAdderBaladuino(t *testing.T) {
@@ -171,8 +167,6 @@ func TestPrototypesAdderBaladuino(t *testing.T) {
 	preprocessed := string(bytes)
 
 	require.Equal(t, preprocessed, strings.Replace(context[constants.CTX_SOURCE].(string), "\r\n", "\n", -1))
-
-	NoError(t, DeleteAnyDotDFile())
 }
 
 func TestPrototypesAdderCharWithEscapedDoubleQuote(t *testing.T) {
@@ -217,8 +211,6 @@ func TestPrototypesAdderCharWithEscapedDoubleQuote(t *testing.T) {
 	preprocessed := string(bytes)
 
 	require.Equal(t, preprocessed, strings.Replace(context[constants.CTX_SOURCE].(string), "\r\n", "\n", -1))
-
-	NoError(t, DeleteAnyDotDFile())
 }
 
 func TestPrototypesAdderIncludeBetweenMultilineComment(t *testing.T) {
@@ -263,8 +255,6 @@ func TestPrototypesAdderIncludeBetweenMultilineComment(t *testing.T) {
 	preprocessed := string(bytes)
 
 	require.Equal(t, preprocessed, strings.Replace(context[constants.CTX_SOURCE].(string), "\r\n", "\n", -1))
-
-	NoError(t, DeleteAnyDotDFile())
 }
 
 func TestPrototypesAdderLineContinuations(t *testing.T) {
@@ -309,8 +299,6 @@ func TestPrototypesAdderLineContinuations(t *testing.T) {
 	preprocessed := string(bytes)
 
 	require.Equal(t, preprocessed, strings.Replace(context[constants.CTX_SOURCE].(string), "\r\n", "\n", -1))
-
-	NoError(t, DeleteAnyDotDFile())
 }
 
 func TestPrototypesAdderStringWithComment(t *testing.T) {
@@ -355,8 +343,6 @@ func TestPrototypesAdderStringWithComment(t *testing.T) {
 	preprocessed := string(bytes)
 
 	require.Equal(t, preprocessed, strings.Replace(context[constants.CTX_SOURCE].(string), "\r\n", "\n", -1))
-
-	NoError(t, DeleteAnyDotDFile())
 }
 
 func TestPrototypesAdderSketchWithStruct(t *testing.T) {
@@ -401,8 +387,6 @@ func TestPrototypesAdderSketchWithStruct(t *testing.T) {
 	preprocessed := string(bytes)
 
 	require.Equal(t, preprocessed, strings.Replace(context[constants.CTX_SOURCE].(string), "\r\n", "\n", -1))
-
-	NoError(t, DeleteAnyDotDFile())
 }
 
 func TestPrototypesAdderSketchWithConfig(t *testing.T) {
@@ -450,6 +434,4 @@ func TestPrototypesAdderSketchWithConfig(t *testing.T) {
 	preprocessed := string(bytes)
 
 	require.Equal(t, preprocessed, strings.Replace(context[constants.CTX_SOURCE].(string), "\r\n", "\n", -1))
-
-	NoError(t, DeleteAnyDotDFile())
 }