Moved some paths into Context

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

Author: cmaglie

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

@@ -73,16 +73,11 @@ const BUILD_PROPERTIES_SOURCE_PATH = "build.source.path"
 const BUILD_PROPERTIES_TOOLS_KEY = "tools"
 const BUILD_PROPERTIES_VID = "vid"
 const CTAGS = "ctags"
-const CTX_ARCHIVE_FILE_PATH_CORE = "archiveFileCore"
-const CTX_BUILD_CORE = "buildCore"
 const CTX_FILE_PATH_TO_READ = "filePathToRead"
 const CTX_HARDWARE_REWRITE_RESULTS = "hardwareRewriteResults"
 const CTX_INCLUDE_SECTION = "includeSection"
 const CTX_INCLUDES_JUST_FOUND = "includesJustFound"
 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 EMPTY_STRING = ""
 const FILE_BOARDS_LOCAL_TXT = "boards.local.txt"

Diff for: src/arduino.cc/builder/phases/core_builder.go

@@ -57,8 +57,8 @@ func (s *CoreBuilder) Run(context map[string]interface{}, ctx *types.Context) er
 		return i18n.WrapError(err)
 	}
 
-	context[constants.CTX_ARCHIVE_FILE_PATH_CORE] = archiveFile
-	context[constants.CTX_OBJECT_FILES_CORE] = objectFiles
+	ctx.CoreArchiveFilePath = archiveFile
+	ctx.CoreObjectsFiles = objectFiles
 
 	return nil
 }

Diff for: src/arduino.cc/builder/phases/libraries_builder.go

@@ -62,7 +62,7 @@ func (s *LibrariesBuilder) Run(context map[string]interface{}, ctx *types.Contex
 		return i18n.WrapError(err)
 	}
 
-	context[constants.CTX_OBJECT_FILES_LIBRARIES] = objectFiles
+	ctx.LibrariesObjectFiles = objectFiles
 
 	return nil
 }

Diff for: src/arduino.cc/builder/phases/linker.go

@@ -43,16 +43,16 @@ import (
 type Linker struct{}
 
 func (s *Linker) Run(context map[string]interface{}, ctx *types.Context) error {
-	objectFilesSketch := context[constants.CTX_OBJECT_FILES_SKETCH].([]string)
-	objectFilesLibraries := context[constants.CTX_OBJECT_FILES_LIBRARIES].([]string)
-	objectFilesCore := context[constants.CTX_OBJECT_FILES_CORE].([]string)
+	objectFilesSketch := ctx.SketchObjectFiles
+	objectFilesLibraries := ctx.LibrariesObjectFiles
+	objectFilesCore := ctx.CoreObjectsFiles
 
 	var objectFiles []string
 	objectFiles = append(objectFiles, objectFilesSketch...)
 	objectFiles = append(objectFiles, objectFilesLibraries...)
 	objectFiles = append(objectFiles, objectFilesCore...)
 
-	coreArchiveFilePath := context[constants.CTX_ARCHIVE_FILE_PATH_CORE].(string)
+	coreArchiveFilePath := ctx.CoreArchiveFilePath
 	buildPath := ctx.BuildPath
 	coreDotARelPath, err := filepath.Rel(buildPath, coreArchiveFilePath)
 	if err != nil {

Diff for: src/arduino.cc/builder/phases/sketch_builder.go

@@ -31,7 +31,6 @@ package phases
 
 import (
 	"arduino.cc/builder/builder_utils"
-	"arduino.cc/builder/constants"
 	"arduino.cc/builder/i18n"
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
@@ -59,7 +58,7 @@ func (s *SketchBuilder) Run(context map[string]interface{}, ctx *types.Context)
 		return i18n.WrapError(err)
 	}
 
-	context[constants.CTX_OBJECT_FILES_SKETCH] = objectFiles
+	ctx.SketchObjectFiles = objectFiles
 
 	return nil
 }

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

@@ -62,7 +62,7 @@ func (s *SetupBuildProperties) Run(context map[string]interface{}, ctx *types.Co
 	}
 	buildProperties[constants.BUILD_PROPERTIES_BUILD_ARCH] = strings.ToUpper(targetPlatform.PlatformId)
 
-	buildProperties[constants.BUILD_PROPERTIES_BUILD_CORE] = context[constants.CTX_BUILD_CORE].(string)
+	buildProperties[constants.BUILD_PROPERTIES_BUILD_CORE] = ctx.BuildCore
 	buildProperties[constants.BUILD_PROPERTIES_BUILD_CORE_PATH] = filepath.Join(actualPlatform.Folder, constants.FOLDER_CORES, buildProperties[constants.BUILD_PROPERTIES_BUILD_CORE])
 	buildProperties[constants.BUILD_PROPERTIES_BUILD_SYSTEM_PATH] = filepath.Join(actualPlatform.Folder, constants.FOLDER_SYSTEM)
 	buildProperties[constants.BUILD_PROPERTIES_RUNTIME_PLATFORM_PATH] = targetPlatform.Folder

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

@@ -97,7 +97,7 @@ func (s *TargetBoardResolver) Run(context map[string]interface{}, ctx *types.Con
 		actualPlatform = targetPlatform
 	}
 
-	context[constants.CTX_BUILD_CORE] = core
+	ctx.BuildCore = core
 	ctx.ActualPlatform = actualPlatform
 
 	return nil

Diff for: src/arduino.cc/builder/test/target_board_resolver_test.go

@@ -194,6 +194,6 @@ func TestTargetBoardResolverCustomCore(t *testing.T) {
 	require.Equal(t, "avr", targetPlatform.PlatformId)
 	targetBoard := ctx.TargetBoard
 	require.Equal(t, "attiny841", targetBoard.BoardId)
-	require.Equal(t, "tiny841", context[constants.CTX_BUILD_CORE].(string))
+	require.Equal(t, "tiny841", ctx.BuildCore)
 	require.Equal(t, "tiny14", targetBoard.Properties[constants.BUILD_PROPERTIES_BUILD_VARIANT])
 }

Diff for: src/arduino.cc/builder/types/context.go

@@ -28,12 +28,17 @@ type Context struct {
 	ActualPlatform *Platform
 	USBVidPid      string
 
-	BuildProperties    props.PropertiesMap
-	BuildPath          string
-	SketchBuildPath    string
-	CoreBuildPath      string
-	LibrariesBuildPath string
-	PreprocPath        string
+	BuildProperties      props.PropertiesMap
+	BuildCore            string
+	BuildPath            string
+	SketchBuildPath      string
+	CoreBuildPath        string
+	CoreArchiveFilePath  string
+	CoreObjectsFiles     []string
+	LibrariesBuildPath   string
+	LibrariesObjectFiles []string
+	PreprocPath          string
+	SketchObjectFiles    []string
 
 	CollectedSourceFiles   *UniqueStringQueue
 	FoldersWithSourceFiles *UniqueSourceFolderQueue