Added some build paths to Context.

Signed-off-by: Cristian Maglie <c.maglie@arduino.cc>

Author: cmaglie

src/arduino.cc/arduino-builder/main.go

@@ -239,11 +239,11 @@ func main() {
 		printErrorMessageAndFlagUsage(errors.New("Parameter '" + FLAG_FQBN + "' is mandatory"))
 	}
 
+	// FLAG_BUILD_PATH
 	buildPath, err := gohasissues.Unquote(*buildPathFlag)
 	if err != nil {
 		printCompleteError(err)
 	}
-
 	if buildPath != "" {
 		_, err := os.Stat(buildPath)
 		if err != nil {
@@ -256,7 +256,7 @@ func main() {
 			printCompleteError(err)
 		}
 	}
-	context[constants.CTX_BUILD_PATH] = buildPath
+	ctx.BuildPath = buildPath
 
 	if *vidPidFlag != "" {
 		context[constants.CTX_VIDPID] = *vidPidFlag

src/arduino.cc/builder/add_additional_entries_to_context.go

@@ -40,8 +40,8 @@ import (
 type AddAdditionalEntriesToContext struct{}
 
 func (s *AddAdditionalEntriesToContext) Run(context map[string]interface{}, ctx *types.Context) error {
-	if utils.MapHas(context, constants.CTX_BUILD_PATH) {
-		buildPath := context[constants.CTX_BUILD_PATH].(string)
+	if ctx.BuildPath != "" {
+		buildPath := ctx.BuildPath
 		preprocPath, err := filepath.Abs(filepath.Join(buildPath, constants.FOLDER_PREPROC))
 		if err != nil {
 			return i18n.WrapError(err)
@@ -59,10 +59,10 @@ func (s *AddAdditionalEntriesToContext) Run(context map[string]interface{}, ctx
 			return i18n.WrapError(err)
 		}
 
-		context[constants.CTX_PREPROC_PATH] = preprocPath
-		context[constants.CTX_SKETCH_BUILD_PATH] = sketchBuildPath
-		context[constants.CTX_LIBRARIES_BUILD_PATH] = librariesBuildPath
-		context[constants.CTX_CORE_BUILD_PATH] = coreBuildPath
+		ctx.PreprocPath = preprocPath
+		ctx.SketchBuildPath = sketchBuildPath
+		ctx.LibrariesBuildPath = librariesBuildPath
+		ctx.CoreBuildPath = coreBuildPath
 	}
 
 	if !utils.MapHas(context, constants.CTX_WARNINGS_LEVEL) {

src/arduino.cc/builder/additional_sketch_files_copier.go

@@ -43,7 +43,7 @@ type AdditionalSketchFilesCopier struct{}
 
 func (s *AdditionalSketchFilesCopier) Run(context map[string]interface{}, ctx *types.Context) error {
 	sketch := context[constants.CTX_SKETCH].(*types.Sketch)
-	sketchBuildPath := context[constants.CTX_SKETCH_BUILD_PATH].(string)
+	sketchBuildPath := ctx.SketchBuildPath
 
 	err := utils.EnsureFolderExists(sketchBuildPath)
 	if err != nil {

src/arduino.cc/builder/coan_runner.go

@@ -49,7 +49,7 @@ func (s *CoanRunner) Run(context map[string]interface{}, ctx *types.Context) err
 	source += "\n"
 	verbose := ctx.Verbose
 
-	preprocPath := context[constants.CTX_PREPROC_PATH].(string)
+	preprocPath := ctx.PreprocPath
 	err := utils.EnsureFolderExists(preprocPath)
 	if err != nil {
 		return i18n.WrapError(err)

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

@@ -80,10 +80,8 @@ const CTX_BUILD_CORE = "buildCore"
 const CTX_BUILD_OPTIONS = "buildOptions"
 const CTX_BUILD_OPTIONS_JSON = "buildOptionsJson"
 const CTX_BUILD_OPTIONS_PREVIOUS_JSON = "buildOptionsPreviousJson"
-const CTX_BUILD_PATH = "buildPath"
 const CTX_BUILD_PROPERTIES = "buildProperties"
 const CTX_COLLECTED_SOURCE_FILES_QUEUE = "collectedSourceFilesQueue"
-const CTX_CORE_BUILD_PATH = "coreBuildPath"
 const CTX_FILE_PATH_TO_READ = "filePathToRead"
 const CTX_FOLDERS_WITH_SOURCES_QUEUE = "foldersWithSourcesQueue"
 const CTX_GCC_MINUS_E_SOURCE = "gccMinusESource"
@@ -94,15 +92,12 @@ const CTX_IMPORTED_LIBRARIES = "importedLibraries"
 const CTX_INCLUDE_FOLDERS = "includeFolders"
 const CTX_INCLUDE_SECTION = "includeSection"
 const CTX_INCLUDES_JUST_FOUND = "includesJustFound"
-const CTX_LIBRARIES_BUILD_PATH = "librariesBuildPath"
 const CTX_LIBRARY_RESOLUTION_RESULTS = "libraryResolutionResults"
 const CTX_LINE_OFFSET = "lineOffset"
 const CTX_OBJECT_FILES_CORE = "objectFilesCore"
 const CTX_OBJECT_FILES_LIBRARIES = "objectFilesLibraries"
 const CTX_OBJECT_FILES_SKETCH = "objectFilesSketch"
 const CTX_PLATFORM_KEYS_REWRITE = "platformKeysRewrite"
-const CTX_PREPROC_PATH = "preprocPath"
-const CTX_SKETCH_BUILD_PATH = "sketchBuildPath"
 const CTX_SKETCH = "sketch"
 const CTX_SOURCE = "source"
 const CTX_TARGET_BOARD = "targetBoard"

src/arduino.cc/builder/container_find_includes.go

@@ -45,15 +45,15 @@ func (s *ContainerFindIncludes) Run(context map[string]interface{}, ctx *types.C
 		return i18n.WrapError(err)
 	}
 
-	sketchBuildPath := context[constants.CTX_SKETCH_BUILD_PATH].(string)
+	sketchBuildPath := ctx.SketchBuildPath
 	sketch := context[constants.CTX_SKETCH].(*types.Sketch)
 	err = findIncludesUntilDone(context, ctx, filepath.Join(sketchBuildPath, filepath.Base(sketch.MainFile.Name)+".cpp"))
 	if err != nil {
 		return i18n.WrapError(err)
 	}
 
 	foldersWithSources := context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE].(*types.UniqueSourceFolderQueue)
-	foldersWithSources.Push(types.SourceFolder{Folder: context[constants.CTX_SKETCH_BUILD_PATH].(string), Recurse: true})
+	foldersWithSources.Push(types.SourceFolder{Folder: ctx.SketchBuildPath, Recurse: true})
 	if utils.MapHas(context, constants.CTX_IMPORTED_LIBRARIES) {
 		for _, library := range context[constants.CTX_IMPORTED_LIBRARIES].([]*types.Library) {
 			sourceFolders := types.LibraryToSourceFolder(library)

src/arduino.cc/builder/ctags_target_file_saver.go

@@ -30,7 +30,6 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
 	"arduino.cc/builder/i18n"
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
@@ -45,7 +44,7 @@ type CTagsTargetFileSaver struct {
 func (s *CTagsTargetFileSaver) Run(context map[string]interface{}, ctx *types.Context) error {
 	source := context[s.SourceField].(string)
 
-	preprocPath := context[constants.CTX_PREPROC_PATH].(string)
+	preprocPath := ctx.PreprocPath
 	err := utils.EnsureFolderExists(preprocPath)
 	if err != nil {
 		return i18n.WrapError(err)

src/arduino.cc/builder/ensure_buildpath_exists.go

@@ -30,7 +30,6 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
 	"arduino.cc/builder/i18n"
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
@@ -39,9 +38,7 @@ import (
 type EnsureBuildPathExists struct{}
 
 func (s *EnsureBuildPathExists) Run(context map[string]interface{}, ctx *types.Context) error {
-	buildPath := context[constants.CTX_BUILD_PATH].(string)
-
-	err := utils.EnsureFolderExists(buildPath)
+	err := utils.EnsureFolderExists(ctx.BuildPath)
 	if err != nil {
 		return i18n.WrapError(err)
 	}

src/arduino.cc/builder/fail_if_buildpath_equals_sketchpath.go

@@ -33,18 +33,17 @@ import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/i18n"
 	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
 	"path/filepath"
 )
 
 type FailIfBuildPathEqualsSketchPath struct{}
 
 func (s *FailIfBuildPathEqualsSketchPath) Run(context map[string]interface{}, ctx *types.Context) error {
-	if !utils.MapHas(context, constants.CTX_BUILD_PATH) || ctx.SketchLocation == "" {
+	if ctx.BuildPath == "" || ctx.SketchLocation == "" {
 		return nil
 	}
 
-	buildPath, err := filepath.Abs(context[constants.CTX_BUILD_PATH].(string))
+	buildPath, err := filepath.Abs(ctx.BuildPath)
 	if err != nil {
 		return i18n.WrapError(err)
 	}

src/arduino.cc/builder/gcc_preproc_runner.go

@@ -45,9 +45,9 @@ type GCCPreprocRunner struct {
 }
 
 func (s *GCCPreprocRunner) Run(context map[string]interface{}, ctx *types.Context) error {
-	sketchBuildPath := context[constants.CTX_SKETCH_BUILD_PATH].(string)
+	sketchBuildPath := ctx.SketchBuildPath
 	sketch := context[constants.CTX_SKETCH].(*types.Sketch)
-	properties, targetFilePath, err := prepareGCCPreprocRecipeProperties(context, filepath.Join(sketchBuildPath, filepath.Base(sketch.MainFile.Name)+".cpp"), s.TargetFileName)
+	properties, targetFilePath, err := prepareGCCPreprocRecipeProperties(context, ctx, filepath.Join(sketchBuildPath, filepath.Base(sketch.MainFile.Name)+".cpp"), s.TargetFileName)
 	if err != nil {
 		return i18n.WrapError(err)
 	}
@@ -75,7 +75,7 @@ type GCCPreprocRunnerForDiscoveringIncludes struct {
 }
 
 func (s *GCCPreprocRunnerForDiscoveringIncludes) Run(context map[string]interface{}, ctx *types.Context) error {
-	properties, _, err := prepareGCCPreprocRecipeProperties(context, s.SourceFilePath, s.TargetFilePath)
+	properties, _, err := prepareGCCPreprocRecipeProperties(context, ctx, s.SourceFilePath, s.TargetFilePath)
 	if err != nil {
 		return i18n.WrapError(err)
 	}
@@ -98,9 +98,9 @@ func (s *GCCPreprocRunnerForDiscoveringIncludes) Run(context map[string]interfac
 	return nil
 }
 
-func prepareGCCPreprocRecipeProperties(context map[string]interface{}, sourceFilePath string, targetFilePath string) (props.PropertiesMap, string, error) {
+func prepareGCCPreprocRecipeProperties(context map[string]interface{}, ctx *types.Context, sourceFilePath string, targetFilePath string) (props.PropertiesMap, string, error) {
 	if targetFilePath != utils.NULLFile() {
-		preprocPath := context[constants.CTX_PREPROC_PATH].(string)
+		preprocPath := ctx.PreprocPath
 		err := utils.EnsureFolderExists(preprocPath)
 		if err != nil {
 			return nil, "", i18n.WrapError(err)