Merge pull request #129 from facchinm/build_options_changed

Don't wipe everything is only sketch path changed

Author: facchinm

src/arduino.cc/builder/wipeout_build_path_if_build_options_changed.go

@@ -36,6 +36,7 @@ import (
 	"arduino.cc/builder/utils"
 	"os"
 	"path/filepath"
+	"regexp"
 )
 
 type WipeoutBuildPathIfBuildOptionsChanged struct{}
@@ -44,7 +45,6 @@ func (s *WipeoutBuildPathIfBuildOptionsChanged) Run(context map[string]interface
 	if !utils.MapHas(context, constants.CTX_BUILD_OPTIONS_PREVIOUS_JSON) {
 		return nil
 	}
-
 	buildOptionsJson := context[constants.CTX_BUILD_OPTIONS_JSON].(string)
 	previousBuildOptionsJson := context[constants.CTX_BUILD_OPTIONS_PREVIOUS_JSON].(string)
 	logger := context[constants.CTX_LOGGER].(i18n.Logger)
@@ -53,6 +53,15 @@ func (s *WipeoutBuildPathIfBuildOptionsChanged) Run(context map[string]interface
 		return nil
 	}
 
+	re := regexp.MustCompile("(?m)^.*" + constants.CTX_SKETCH_LOCATION + ".*$[\r\n]+")
+	buildOptionsJson = re.ReplaceAllString(buildOptionsJson, "")
+	previousBuildOptionsJson = re.ReplaceAllString(previousBuildOptionsJson, "")
+
+	// if the only difference is the sketch path skip deleting everything
+	if buildOptionsJson == previousBuildOptionsJson {
+		return nil
+	}
+
 	logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_BUILD_OPTIONS_CHANGED)
 
 	buildPath := context[constants.CTX_BUILD_PATH].(string)