IncludeFolders now in Context

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

Author: cmaglie

src/arduino.cc/builder/constants/constants.go

@@ -81,7 +81,6 @@ const CTX_GCC_MINUS_E_SOURCE = "gccMinusESource"
 const CTX_GCC_MINUS_M_OUTPUT = "gccMinusMOutput"
 const CTX_HARDWARE = "hardware"
 const CTX_HARDWARE_REWRITE_RESULTS = "hardwareRewriteResults"
-const CTX_INCLUDE_FOLDERS = "includeFolders"
 const CTX_INCLUDE_SECTION = "includeSection"
 const CTX_INCLUDES_JUST_FOUND = "includesJustFound"
 const CTX_LINE_OFFSET = "lineOffset"

src/arduino.cc/builder/gcc_preproc_runner.go

@@ -112,7 +112,7 @@ func prepareGCCPreprocRecipeProperties(context map[string]interface{}, ctx *type
 	properties[constants.BUILD_PROPERTIES_SOURCE_FILE] = sourceFilePath
 	properties[constants.BUILD_PROPERTIES_PREPROCESSED_FILE_PATH] = targetFilePath
 
-	includes := context[constants.CTX_INCLUDE_FOLDERS].([]string)
+	includes := ctx.IncludeFolders
 	includes = utils.Map(includes, utils.WrapWithHyphenI)
 	properties[constants.BUILD_PROPERTIES_INCLUDES] = strings.Join(includes, constants.SPACE)
 	builder_utils.RemoveHyphenMDDFlagFromGCCCommandLine(properties)

src/arduino.cc/builder/includes_finder_with_gcc.go

@@ -47,12 +47,8 @@ func (s *IncludesFinderWithGCC) Run(context map[string]interface{}, ctx *types.C
 	verbose := ctx.Verbose
 	logger := ctx.GetLogger()
 
-	includesParams := constants.EMPTY_STRING
-	if utils.MapHas(context, constants.CTX_INCLUDE_FOLDERS) {
-		includes := context[constants.CTX_INCLUDE_FOLDERS].([]string)
-		includes = utils.Map(includes, utils.WrapWithHyphenI)
-		includesParams = strings.Join(includes, " ")
-	}
+	includes := utils.Map(ctx.IncludeFolders, utils.WrapWithHyphenI)
+	includesParams := strings.Join(includes, " ")
 
 	properties := buildProperties.Clone()
 	properties[constants.BUILD_PROPERTIES_SOURCE_FILE] = s.SourceFile

src/arduino.cc/builder/includes_to_include_folders.go

@@ -68,11 +68,7 @@ func (s *IncludesToIncludeFolders) Run(context map[string]interface{}, ctx *type
 	}
 
 	ctx.ImportedLibraries = importedLibraries
-
-	buildProperties := ctx.BuildProperties
-	verbose := ctx.Verbose
-	includeFolders := resolveIncludeFolders(newlyImportedLibraries, buildProperties, verbose)
-	context[constants.CTX_INCLUDE_FOLDERS] = includeFolders
+	ctx.IncludeFolders = resolveIncludeFolders(newlyImportedLibraries, ctx.BuildProperties, ctx.Verbose)
 
 	return nil
 }

src/arduino.cc/builder/phases/libraries_builder.go

@@ -45,7 +45,7 @@ type LibrariesBuilder struct{}
 func (s *LibrariesBuilder) Run(context map[string]interface{}, ctx *types.Context) error {
 	librariesBuildPath := ctx.LibrariesBuildPath
 	buildProperties := ctx.BuildProperties
-	includes := context[constants.CTX_INCLUDE_FOLDERS].([]string)
+	includes := ctx.IncludeFolders
 	includes = utils.Map(includes, utils.WrapWithHyphenI)
 	libraries := ctx.ImportedLibraries
 	verbose := ctx.Verbose

src/arduino.cc/builder/phases/sketch_builder.go

@@ -42,7 +42,7 @@ type SketchBuilder struct{}
 func (s *SketchBuilder) Run(context map[string]interface{}, ctx *types.Context) error {
 	sketchBuildPath := ctx.SketchBuildPath
 	buildProperties := ctx.BuildProperties
-	includes := context[constants.CTX_INCLUDE_FOLDERS].([]string)
+	includes := ctx.IncludeFolders
 	includes = utils.Map(includes, utils.WrapWithHyphenI)
 	verbose := ctx.Verbose
 	warningsLevel := ctx.WarningsLevel

src/arduino.cc/builder/types/context.go

@@ -43,6 +43,7 @@ type Context struct {
 	HeaderToLibraries          map[string][]*Library
 	ImportedLibraries          []*Library
 	LibrariesResolutionResults map[string]LibraryResolutionResult
+	IncludeFolders             []string
 
 	// C++ Parsing
 	CTagsOutput                 string