GCC doesn't like paths with \, because \ is a special char. Escaping.

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

Author: Federico Fissore

src/arduino.cc/builder/sketch_source_merger.go

@@ -32,6 +32,7 @@ package builder
 import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/types"
+	"strings"
 )
 
 type SketchSourceMerger struct{}
@@ -51,7 +52,7 @@ func (s *SketchSourceMerger) Run(context map[string]interface{}) error {
 }
 
 func addPreprocLine(sketch *types.SketchFile) string {
-	source := "#line 1 \"" + sketch.Name + "\"\n"
+	source := "#line 1 \"" + strings.Replace(sketch.Name, "\\", "\\\\", -1) + "\"\n"
 	source += sketch.Source
 	source += "\n"
 

src/arduino.cc/builder/test/helper.go

@@ -38,12 +38,19 @@ import (
 	"github.com/stretchr/testify/assert"
 	"io/ioutil"
 	"path/filepath"
+	"strings"
 	"testing"
 	"text/template"
 )
 
 func LoadAndInterpolate(t *testing.T, filename string, context map[string]interface{}) string {
-	tpl, err := template.ParseFiles(filename)
+	funcsMap := template.FuncMap{
+		"EscapeBackSlashes": func(s string) string {
+			return strings.Replace(s, "\\", "\\\\", -1)
+		},
+	}
+
+	tpl, err := template.New(filepath.Base(filename)).Funcs(funcsMap).ParseFiles(filename)
 	NoError(t, err)
 
 	var buf bytes.Buffer

src/arduino.cc/builder/test/sketch1/merged_sketch.txt

@@ -1,14 +1,14 @@
-#line 1 "{{.sketch.MainFile.Name}}"
+#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
 void setup() {
 
 }
 
 void loop() {
 
 }
-#line 1 "{{(index .sketch.OtherSketchFiles 0).Name}}"
+#line 1 "{{EscapeBackSlashes (index .sketch.OtherSketchFiles 0).Name}}"
 
-#line 1 "{{(index .sketch.OtherSketchFiles 1).Name}}"
+#line 1 "{{EscapeBackSlashes (index .sketch.OtherSketchFiles 1).Name}}"
 String hello() {
   return "world";
 }

src/arduino.cc/builder/test/sketch2/SketchWithIfDef.preprocessed.txt

@@ -1,6 +1,6 @@
 #include <Arduino.h>
 #line 1
-#line 1 "{{.sketch.MainFile.Name}}"
+#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
 #define DEBUG 1
 #define DISABLED 0
 

src/arduino.cc/builder/test/sketch2/SketchWithIfDef.resolved.directives.txt

@@ -1,4 +1,4 @@
-#line 1 "{{.sketch.MainFile.Name}}"
+#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
 #define DEBUG 1
 #define DISABLED 0
 

src/arduino.cc/builder/test/sketch3/Baladuino.preprocessed.txt

@@ -1,6 +1,6 @@
 #include <Arduino.h>
 #line 1
-#line 1 "{{.sketch.MainFile.Name}}"
+#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
 /*
  * The code is released under the GNU General Public License.
  * Developed by Kristian Lauszus, TKJ Electronics 2013

src/arduino.cc/builder/test/sketch4/CharWithEscapedDoubleQuote.preprocessed.txt

@@ -1,6 +1,6 @@
 #include <Arduino.h>
 #line 1
-#line 1 "{{.sketch.MainFile.Name}}"
+#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
 #include <SoftwareSerial.h> // required to send and receive AT commands from the GPRS Shield
 #include <Wire.h> // required for I2C communication with the RTC
 

src/arduino.cc/builder/test/sketch5/IncludeBetweenMultilineComment.preprocessed.txt

@@ -1,6 +1,6 @@
 #include <Arduino.h>
 #line 1
-#line 1 "{{.sketch.MainFile.Name}}"
+#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
 #include <CapacitiveSensor.h>
 /*
 #include <WiFi.h>

src/arduino.cc/builder/test/sketch6/LineContinuations.preprocessed.txt

@@ -1,6 +1,6 @@
 #include <Arduino.h>
 #line 1
-#line 1 "{{.sketch.MainFile.Name}}"
+#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
 const char *foo = "\
 hello \
 world\n";

src/arduino.cc/builder/test/sketch7/StringWithComment.preprocessed.txt

@@ -1,6 +1,6 @@
 #include <Arduino.h>
 #line 1
-#line 1 "{{.sketch.MainFile.Name}}"
+#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
 void setup();
 void loop();
 #line 1