BuildProperties are now part of Context

cmaglie · cmaglie · commit 310f2e22b0c9 · 2016-05-03T11:45:30.000+02:00
Signed-off-by: Cristian Maglie &lt;c.maglie@arduino.cc&gt;
diff --git a/src/arduino.cc/builder/add_missing_build_properties_from_parent_platform_txt_files.go b/src/arduino.cc/builder/add_missing_build_properties_from_parent_platform_txt_files.go
@@ -31,7 +31,6 @@ package builder
 
 import (
 	"arduino.cc/builder/constants"
-	"arduino.cc/builder/props"
 	"arduino.cc/builder/types"
 )
 
@@ -40,13 +39,13 @@ type AddMissingBuildPropertiesFromParentPlatformTxtFiles struct{}
 func (s *AddMissingBuildPropertiesFromParentPlatformTxtFiles) Run(context map[string]interface{}, ctx *types.Context) error {
 	packages := context[constants.CTX_HARDWARE].(*types.Packages)
 	targetPackage := ctx.TargetPackage
-	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
+	buildProperties := ctx.BuildProperties
 
 	newBuildProperties := packages.Properties.Clone()
 	newBuildProperties.Merge(targetPackage.Properties)
 	newBuildProperties.Merge(buildProperties)
 
-	context[constants.CTX_BUILD_PROPERTIES] = newBuildProperties
+	ctx.BuildProperties = newBuildProperties
 
 	return nil
 }
diff --git a/src/arduino.cc/builder/coan_runner.go b/src/arduino.cc/builder/coan_runner.go
@@ -32,7 +32,6 @@ package builder
 import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/props"
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
 	"fmt"
@@ -61,7 +60,7 @@ func (s *CoanRunner) Run(context map[string]interface{}, ctx *types.Context) err
 		return i18n.WrapError(err)
 	}
 
-	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
+	buildProperties := ctx.BuildProperties
 	properties := buildProperties.Clone()
 	properties.Merge(buildProperties.SubTree(constants.BUILD_PROPERTIES_TOOLS_KEY).SubTree(constants.COAN))
 	properties[constants.BUILD_PROPERTIES_SOURCE_FILE] = coanTargetFileName
diff --git a/src/arduino.cc/builder/constants/constants.go b/src/arduino.cc/builder/constants/constants.go
@@ -76,7 +76,6 @@ const COAN = "coan"
 const CTAGS = "ctags"
 const CTX_ARCHIVE_FILE_PATH_CORE = "archiveFileCore"
 const CTX_BUILD_CORE = "buildCore"
-const CTX_BUILD_PROPERTIES = "buildProperties"
 const CTX_FILE_PATH_TO_READ = "filePathToRead"
 const CTX_GCC_MINUS_E_SOURCE = "gccMinusESource"
 const CTX_GCC_MINUS_M_OUTPUT = "gccMinusMOutput"
diff --git a/src/arduino.cc/builder/ctags/ctags_runner.go b/src/arduino.cc/builder/ctags/ctags_runner.go
@@ -32,7 +32,6 @@ package ctags
 import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/props"
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
 	"fmt"
@@ -41,7 +40,7 @@ import (
 type CTagsRunner struct{}
 
 func (s *CTagsRunner) Run(context map[string]interface{}, ctx *types.Context) error {
-	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
+	buildProperties := ctx.BuildProperties
 	ctagsTargetFilePath := ctx.CTagsTargetFile
 	logger := ctx.GetLogger()
 
diff --git a/src/arduino.cc/builder/dump_build_properties.go b/src/arduino.cc/builder/dump_build_properties.go
@@ -30,8 +30,6 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/props"
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
 	"fmt"
@@ -41,7 +39,7 @@ import (
 type DumpBuildProperties struct{}
 
 func (s *DumpBuildProperties) Run(context map[string]interface{}, ctx *types.Context) error {
-	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
+	buildProperties := ctx.BuildProperties
 
 	keys := utils.KeysOfMapOfString(buildProperties)
 	sort.Strings(keys)
diff --git a/src/arduino.cc/builder/gcc_preproc_runner.go b/src/arduino.cc/builder/gcc_preproc_runner.go
@@ -108,11 +108,7 @@ func prepareGCCPreprocRecipeProperties(context map[string]interface{}, ctx *type
 		targetFilePath = filepath.Join(preprocPath, targetFilePath)
 	}
 
-	properties := make(props.PropertiesMap)
-	if p, ok := context[constants.CTX_BUILD_PROPERTIES]; ok {
-		properties = p.(props.PropertiesMap).Clone()
-	}
-
+	properties := ctx.BuildProperties
 	properties[constants.BUILD_PROPERTIES_SOURCE_FILE] = sourceFilePath
 	properties[constants.BUILD_PROPERTIES_PREPROCESSED_FILE_PATH] = targetFilePath
 
diff --git a/src/arduino.cc/builder/includes_finder_with_gcc.go b/src/arduino.cc/builder/includes_finder_with_gcc.go
@@ -33,7 +33,6 @@ import (
 	"arduino.cc/builder/builder_utils"
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/props"
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
 	"strings"
@@ -44,10 +43,7 @@ type IncludesFinderWithGCC struct {
 }
 
 func (s *IncludesFinderWithGCC) Run(context map[string]interface{}, ctx *types.Context) error {
-	buildProperties := make(props.PropertiesMap)
-	if p, ok := context[constants.CTX_BUILD_PROPERTIES]; ok {
-		buildProperties = p.(props.PropertiesMap).Clone()
-	}
+	buildProperties := ctx.BuildProperties
 	verbose := ctx.Verbose
 	logger := ctx.GetLogger()
 
diff --git a/src/arduino.cc/builder/includes_to_include_folders.go b/src/arduino.cc/builder/includes_to_include_folders.go
@@ -69,7 +69,7 @@ func (s *IncludesToIncludeFolders) Run(context map[string]interface{}, ctx *type
 
 	ctx.ImportedLibraries = importedLibraries
 
-	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
+	buildProperties := ctx.BuildProperties
 	verbose := ctx.Verbose
 	includeFolders := resolveIncludeFolders(newlyImportedLibraries, buildProperties, verbose)
 	context[constants.CTX_INCLUDE_FOLDERS] = includeFolders
diff --git a/src/arduino.cc/builder/load_vid_pid_specific_properties.go b/src/arduino.cc/builder/load_vid_pid_specific_properties.go
@@ -52,7 +52,7 @@ func (s *LoadVIDPIDSpecificProperties) Run(context map[string]interface{}, ctx *
 	vid := vidPidParts[0]
 	pid := vidPidParts[1]
 
-	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
+	buildProperties := ctx.BuildProperties
 	VIDPIDIndex, err := findVIDPIDIndex(buildProperties, vid, pid)
 	if err != nil {
 		return i18n.WrapError(err)
diff --git a/src/arduino.cc/builder/merge_sketch_with_bootloader.go b/src/arduino.cc/builder/merge_sketch_with_bootloader.go
@@ -32,7 +32,6 @@ package builder
 import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/props"
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
 	"os"
@@ -43,7 +42,7 @@ import (
 type MergeSketchWithBootloader struct{}
 
 func (s *MergeSketchWithBootloader) Run(context map[string]interface{}, ctx *types.Context) error {
-	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
+	buildProperties := ctx.BuildProperties
 	if !utils.MapStringStringHas(buildProperties, constants.BUILD_PROPERTIES_BOOTLOADER_NOBLINK) && !utils.MapStringStringHas(buildProperties, constants.BUILD_PROPERTIES_BOOTLOADER_FILE) {
 		return nil
 	}
diff --git a/src/arduino.cc/builder/phases/core_builder.go b/src/arduino.cc/builder/phases/core_builder.go
@@ -42,7 +42,7 @@ type CoreBuilder struct{}
 
 func (s *CoreBuilder) Run(context map[string]interface{}, ctx *types.Context) error {
 	coreBuildPath := ctx.CoreBuildPath
-	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
+	buildProperties := ctx.BuildProperties
 	verbose := ctx.Verbose
 	warningsLevel := ctx.WarningsLevel
 	logger := ctx.GetLogger()
diff --git a/src/arduino.cc/builder/phases/libraries_builder.go b/src/arduino.cc/builder/phases/libraries_builder.go
@@ -44,7 +44,7 @@ type LibrariesBuilder struct{}
 
 func (s *LibrariesBuilder) Run(context map[string]interface{}, ctx *types.Context) error {
 	librariesBuildPath := ctx.LibrariesBuildPath
-	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
+	buildProperties := ctx.BuildProperties
 	includes := context[constants.CTX_INCLUDE_FOLDERS].([]string)
 	includes = utils.Map(includes, utils.WrapWithHyphenI)
 	libraries := ctx.ImportedLibraries
diff --git a/src/arduino.cc/builder/phases/linker.go b/src/arduino.cc/builder/phases/linker.go
@@ -59,7 +59,7 @@ func (s *Linker) Run(context map[string]interface{}, ctx *types.Context) error {
 		return i18n.WrapError(err)
 	}
 
-	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
+	buildProperties := ctx.BuildProperties
 	verbose := ctx.Verbose
 	warningsLevel := ctx.WarningsLevel
 	logger := ctx.GetLogger()
diff --git a/src/arduino.cc/builder/phases/sketch_builder.go b/src/arduino.cc/builder/phases/sketch_builder.go
@@ -33,7 +33,6 @@ import (
 	"arduino.cc/builder/builder_utils"
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/props"
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
 )
@@ -42,7 +41,7 @@ type SketchBuilder struct{}
 
 func (s *SketchBuilder) Run(context map[string]interface{}, ctx *types.Context) error {
 	sketchBuildPath := ctx.SketchBuildPath
-	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
+	buildProperties := ctx.BuildProperties
 	includes := context[constants.CTX_INCLUDE_FOLDERS].([]string)
 	includes = utils.Map(includes, utils.WrapWithHyphenI)
 	verbose := ctx.Verbose
diff --git a/src/arduino.cc/builder/recipe_runner.go b/src/arduino.cc/builder/recipe_runner.go
@@ -33,7 +33,6 @@ import (
 	"arduino.cc/builder/builder_utils"
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/props"
 	"arduino.cc/builder/types"
 	"os"
 	"sort"
@@ -51,10 +50,7 @@ func (s *RecipeByPrefixSuffixRunner) Run(context map[string]interface{}, ctx *ty
 		logger.Fprintln(os.Stdout, constants.LOG_LEVEL_DEBUG, constants.MSG_LOOKING_FOR_RECIPES, s.Prefix, s.Suffix)
 	}
 
-	buildProperties := make(props.PropertiesMap)
-	if p, ok := context[constants.CTX_BUILD_PROPERTIES]; ok {
-		buildProperties = p.(props.PropertiesMap).Clone()
-	}
+	buildProperties := ctx.BuildProperties
 	verbose := ctx.Verbose
 
 	recipes := findRecipes(buildProperties, s.Prefix, s.Suffix)
diff --git a/src/arduino.cc/builder/set_custom_build_properties.go b/src/arduino.cc/builder/set_custom_build_properties.go
@@ -30,7 +30,6 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
 	"arduino.cc/builder/i18n"
 	"arduino.cc/builder/props"
 	"arduino.cc/builder/types"
@@ -40,7 +39,7 @@ type SetCustomBuildProperties struct{}
 
 func (s *SetCustomBuildProperties) Run(context map[string]interface{}, ctx *types.Context) error {
 	logger := ctx.GetLogger()
-	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
+	buildProperties := ctx.BuildProperties
 	customBuildProperties, err := props.LoadFromSlice(ctx.CustomBuildProperties, logger)
 	if err != nil {
 		return i18n.WrapError(err)
diff --git a/src/arduino.cc/builder/setup_build_properties.go b/src/arduino.cc/builder/setup_build_properties.go
@@ -111,7 +111,7 @@ func (s *SetupBuildProperties) Run(context map[string]interface{}, ctx *types.Co
 	buildProperties[constants.BUILD_PROPERTIES_EXTRA_TIME_ZONE] = strconv.Itoa(utils.TimezoneOffset())
 	buildProperties[constants.BUILD_PROPERTIES_EXTRA_TIME_DST] = strconv.Itoa(utils.DaylightSavingsOffset(now))
 
-	context[constants.CTX_BUILD_PROPERTIES] = buildProperties
+	ctx.BuildProperties = buildProperties
 
 	return nil
 }
diff --git a/src/arduino.cc/builder/test/load_vid_pid_specific_properties_test.go b/src/arduino.cc/builder/test/load_vid_pid_specific_properties_test.go
@@ -32,7 +32,6 @@ package test
 import (
 	"arduino.cc/builder"
 	"arduino.cc/builder/constants"
-	"arduino.cc/builder/props"
 	"arduino.cc/builder/types"
 	"github.com/stretchr/testify/require"
 	"os"
@@ -64,7 +63,7 @@ func TestLoadVIDPIDSpecificPropertiesWhenNoVIDPIDAreProvided(t *testing.T) {
 		NoError(t, err)
 	}
 
-	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
+	buildProperties := ctx.BuildProperties
 
 	require.Equal(t, "0x0037", buildProperties["pid.0"])
 	require.Equal(t, "\"Genuino Micro\"", buildProperties["vid.4.build.usb_product"])
@@ -97,7 +96,7 @@ func TestLoadVIDPIDSpecificProperties(t *testing.T) {
 		NoError(t, err)
 	}
 
-	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
+	buildProperties := ctx.BuildProperties
 
 	require.Equal(t, "0x0037", buildProperties["pid.0"])
 	require.Equal(t, "\"Genuino Micro\"", buildProperties["vid.4.build.usb_product"])
diff --git a/src/arduino.cc/builder/test/merge_sketch_with_bootloader_test.go b/src/arduino.cc/builder/test/merge_sketch_with_bootloader_test.go
@@ -32,7 +32,6 @@ package test
 import (
 	"arduino.cc/builder"
 	"arduino.cc/builder/constants"
-	"arduino.cc/builder/props"
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
 	"github.com/stretchr/testify/require"
@@ -155,7 +154,7 @@ func TestMergeSketchWithBootloaderWhenNoBootloaderAvailable(t *testing.T) {
 		NoError(t, err)
 	}
 
-	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
+	buildProperties := ctx.BuildProperties
 	delete(buildProperties, constants.BUILD_PROPERTIES_BOOTLOADER_NOBLINK)
 	delete(buildProperties, constants.BUILD_PROPERTIES_BOOTLOADER_FILE)
 
diff --git a/src/arduino.cc/builder/test/recipe_runner_test.go b/src/arduino.cc/builder/test/recipe_runner_test.go
@@ -46,7 +46,7 @@ func TestRecipeRunner(t *testing.T) {
 	context := make(map[string]interface{})
 	ctx := &types.Context{}
 	buildProperties := make(props.PropertiesMap)
-	context[constants.CTX_BUILD_PROPERTIES] = buildProperties
+	ctx.BuildProperties = buildProperties
 
 	buildProperties["recipe.hooks.prebuild.1.pattern"] = "echo"
 
diff --git a/src/arduino.cc/builder/test/setup_build_properties_test.go b/src/arduino.cc/builder/test/setup_build_properties_test.go
@@ -32,7 +32,6 @@ package test
 import (
 	"arduino.cc/builder"
 	"arduino.cc/builder/constants"
-	"arduino.cc/builder/props"
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
 	"github.com/stretchr/testify/require"
@@ -70,7 +69,7 @@ func TestSetupBuildProperties(t *testing.T) {
 		NoError(t, err)
 	}
 
-	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
+	buildProperties := ctx.BuildProperties
 
 	require.Equal(t, "ARDUINO", buildProperties[constants.BUILD_PROPERTIES_SOFTWARE])
 
@@ -135,7 +134,7 @@ func TestSetupBuildPropertiesWithSomeCustomOverrides(t *testing.T) {
 		NoError(t, err)
 	}
 
-	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
+	buildProperties := ctx.BuildProperties
 
 	require.Equal(t, "ARDUINO", buildProperties[constants.BUILD_PROPERTIES_SOFTWARE])
 
@@ -174,7 +173,7 @@ func TestSetupBuildPropertiesUserHardware(t *testing.T) {
 		NoError(t, err)
 	}
 
-	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
+	buildProperties := ctx.BuildProperties
 
 	require.Equal(t, "ARDUINO", buildProperties[constants.BUILD_PROPERTIES_SOFTWARE])
 
@@ -208,7 +207,7 @@ func TestSetupBuildPropertiesWithMissingPropsFromParentPlatformTxtFiles(t *testi
 		NoError(t, err)
 	}
 
-	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
+	buildProperties := ctx.BuildProperties
 
 	require.Equal(t, "ARDUINO", buildProperties[constants.BUILD_PROPERTIES_SOFTWARE])
 
diff --git a/src/arduino.cc/builder/types/context.go b/src/arduino.cc/builder/types/context.go
@@ -25,6 +25,7 @@ type Context struct {
 	TargetPlatform *Platform
 	ActualPlatform *Platform
 
+	BuildProperties    props.PropertiesMap
 	BuildPath          string
 	SketchBuildPath    string
 	CoreBuildPath      string
diff --git a/src/arduino.cc/builder/warn_about_arch_incompatible_libraries.go b/src/arduino.cc/builder/warn_about_arch_incompatible_libraries.go
@@ -31,7 +31,6 @@ package builder
 
 import (
 	"arduino.cc/builder/constants"
-	"arduino.cc/builder/props"
 	"arduino.cc/builder/types"
 	"os"
 	"strings"
@@ -45,7 +44,7 @@ func (s *WarnAboutArchIncompatibleLibraries) Run(context map[string]interface{},
 	}
 
 	targetPlatform := ctx.TargetPlatform
-	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
+	buildProperties := ctx.BuildProperties
 	logger := ctx.GetLogger()
 
 	archs := []string{}
