Show errors during include detection properly

When an include could not be resolved, the preprocessor was ran again to
show the include error as reported by the compiler to the user. However,
the preprocessor was now always run against the main sketch, instead of
the file currently being processed. Unless the problem was in fact in
the main sketch, this caused no error to be shown and include detection
continued with the next file instead of being aborted as intended.

This fixes the problem by running the preprocessor on the right file. In
the future, this error handling might be a bit more improved, but for
now this should be sufficient.

Signed-off-by: Matthijs Kooijman <matthijs@stdin.nl>

Author: matthijskooijman

src/arduino.cc/builder/container_add_prototypes.go

@@ -30,6 +30,8 @@
 package builder
 
 import (
+	"path/filepath"
+
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/ctags"
 	"arduino.cc/builder/i18n"
@@ -39,8 +41,9 @@ import (
 type ContainerAddPrototypes struct{}
 
 func (s *ContainerAddPrototypes) Run(ctx *types.Context) error {
+	sourceFile := filepath.Join(ctx.SketchBuildPath, filepath.Base(ctx.Sketch.MainFile.Name)+".cpp")
 	commands := []types.Command{
-		&GCCPreprocRunner{TargetFileName: constants.FILE_CTAGS_TARGET_FOR_GCC_MINUS_E},
+		&GCCPreprocRunner{SourceFilePath: sourceFile, TargetFileName: constants.FILE_CTAGS_TARGET_FOR_GCC_MINUS_E},
 		&ReadFileAndStoreInContext{Target: &ctx.SourceGccMinusE},
 		&FilterSketchSource{Source: &ctx.SourceGccMinusE},
 		&CTagsTargetFileSaver{Source: &ctx.SourceGccMinusE, TargetFileName: constants.FILE_CTAGS_TARGET_FOR_GCC_MINUS_E},

src/arduino.cc/builder/container_find_includes.go

@@ -340,7 +340,7 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile t
 		library := ResolveLibrary(ctx, include)
 		if library == nil {
 			// Library could not be resolved, show error
-			err := runCommand(ctx, &GCCPreprocRunner{TargetFileName: constants.FILE_CTAGS_TARGET_FOR_GCC_MINUS_E})
+			err := runCommand(ctx, &GCCPreprocRunner{SourceFilePath: sourcePath, TargetFileName: constants.FILE_CTAGS_TARGET_FOR_GCC_MINUS_E})
 			return i18n.WrapError(err)
 		}
 

src/arduino.cc/builder/gcc_preproc_runner.go

@@ -42,13 +42,12 @@ import (
 )
 
 type GCCPreprocRunner struct {
+	SourceFilePath string
 	TargetFileName string
 }
 
 func (s *GCCPreprocRunner) Run(ctx *types.Context) error {
-	sketchBuildPath := ctx.SketchBuildPath
-	sketch := ctx.Sketch
-	properties, targetFilePath, err := prepareGCCPreprocRecipeProperties(ctx, filepath.Join(sketchBuildPath, filepath.Base(sketch.MainFile.Name)+".cpp"), s.TargetFileName)
+	properties, targetFilePath, err := prepareGCCPreprocRecipeProperties(ctx, s.SourceFilePath, s.TargetFileName)
 	if err != nil {
 		return i18n.WrapError(err)
 	}