Removed sketch name from regexp. Do not full-rebuild if only sketch path changed.

This commit fix two problems:

1) the sketch path is used as-is in a regexp: this causes
   troubles if the path contains regexp control chars
   like `[-]().\` etc.
2) the sketch is not fully rebuild if the only thing that
   changes is the sketch path.

Signed-off-by: Cristian Maglie <[email protected]>

Author: cmaglie

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

@@ -35,6 +35,7 @@ import (
 	"github.com/go-errors/errors"
 	"io/ioutil"
 	"os"
+	"reflect"
 	"regexp"
 	"runtime"
 	"strings"
@@ -170,6 +171,10 @@ func (aMap PropertiesMap) Clone() PropertiesMap {
 	return newMap
 }
 
+func (aMap PropertiesMap) Equals(anotherMap PropertiesMap) bool {
+	return reflect.DeepEqual(aMap, anotherMap)
+}
+
 func MergeMapsOfProperties(target map[string]PropertiesMap, sources ...map[string]PropertiesMap) map[string]PropertiesMap {
 	for _, source := range sources {
 		for key, value := range source {

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

@@ -33,10 +33,11 @@ import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/gohasissues"
 	"arduino.cc/builder/i18n"
+	"arduino.cc/builder/props"
 	"arduino.cc/builder/types"
+	"encoding/json"
 	"os"
 	"path/filepath"
-	"regexp"
 )
 
 type WipeoutBuildPathIfBuildOptionsChanged struct{}
@@ -49,16 +50,18 @@ func (s *WipeoutBuildPathIfBuildOptionsChanged) Run(ctx *types.Context) error {
 	previousBuildOptionsJson := ctx.BuildOptionsJsonPrevious
 	logger := ctx.GetLogger()
 
-	if buildOptionsJson == previousBuildOptionsJson {
-		return nil
-	}
+	var opts props.PropertiesMap
+	var prevOpts props.PropertiesMap
+	json.Unmarshal([]byte(buildOptionsJson), &opts)
+	json.Unmarshal([]byte(previousBuildOptionsJson), &prevOpts)
 
-	re := regexp.MustCompile("(?m)^.*" + ctx.SketchLocation + ".*$[\r\n]+")
-	buildOptionsJson = re.ReplaceAllString(buildOptionsJson, "")
-	previousBuildOptionsJson = re.ReplaceAllString(previousBuildOptionsJson, "")
+	// If SketchLocation path is different but filename is the same, consider it equal
+	if filepath.Base(opts["sketchLocation"]) == filepath.Base(prevOpts["sketchLocation"]) {
+		delete(opts, "sketchLocation")
+		delete(prevOpts, "sketchLocation")
+	}
 
-	// if the only difference is the sketch path skip deleting everything
-	if buildOptionsJson == previousBuildOptionsJson {
+	if opts.Equals(prevOpts) {
 		return nil
 	}