Moved WarningsLevel into Context

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

Author: cmaglie

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

@@ -289,7 +289,7 @@ func main() {
 	}
 
 	if *warningsLevelFlag != "" {
-		context[constants.CTX_WARNINGS_LEVEL] = *warningsLevelFlag
+		ctx.WarningsLevel = *warningsLevelFlag
 	}
 
 	if *debugLevelFlag > -1 {

src/arduino.cc/builder/add_additional_entries_to_context.go

@@ -33,7 +33,6 @@ import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/i18n"
 	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
 	"path/filepath"
 )
 
@@ -65,8 +64,8 @@ func (s *AddAdditionalEntriesToContext) Run(context map[string]interface{}, ctx
 		ctx.CoreBuildPath = coreBuildPath
 	}
 
-	if !utils.MapHas(context, constants.CTX_WARNINGS_LEVEL) {
-		context[constants.CTX_WARNINGS_LEVEL] = DEFAULT_WARNINGS_LEVEL
+	if ctx.WarningsLevel == "" {
+		ctx.WarningsLevel = DEFAULT_WARNINGS_LEVEL
 	}
 
 	sourceFiles := &types.UniqueStringQueue{}

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

@@ -105,7 +105,6 @@ const CTX_TARGET_PACKAGE = "targetPackage"
 const CTX_TARGET_PLATFORM = "targetPlatform"
 const CTX_TOOLS = "tools"
 const CTX_VIDPID = "VIDPID"
-const CTX_WARNINGS_LEVEL = "warningLevel"
 const EMPTY_STRING = ""
 const FILE_BOARDS_LOCAL_TXT = "boards.local.txt"
 const FILE_BOARDS_TXT = "boards.txt"

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

@@ -44,7 +44,7 @@ func (s *CoreBuilder) Run(context map[string]interface{}, ctx *types.Context) er
 	coreBuildPath := ctx.CoreBuildPath
 	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
 	verbose := ctx.Verbose
-	warningsLevel := context[constants.CTX_WARNINGS_LEVEL].(string)
+	warningsLevel := ctx.WarningsLevel
 	logger := ctx.GetLogger()
 
 	err := utils.EnsureFolderExists(coreBuildPath)

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

@@ -49,7 +49,7 @@ func (s *LibrariesBuilder) Run(context map[string]interface{}, ctx *types.Contex
 	includes = utils.Map(includes, utils.WrapWithHyphenI)
 	libraries := context[constants.CTX_IMPORTED_LIBRARIES].([]*types.Library)
 	verbose := ctx.Verbose
-	warningsLevel := context[constants.CTX_WARNINGS_LEVEL].(string)
+	warningsLevel := ctx.WarningsLevel
 	logger := ctx.GetLogger()
 
 	err := utils.EnsureFolderExists(librariesBuildPath)

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

@@ -61,7 +61,7 @@ func (s *Linker) Run(context map[string]interface{}, ctx *types.Context) error {
 
 	buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
 	verbose := ctx.Verbose
-	warningsLevel := context[constants.CTX_WARNINGS_LEVEL].(string)
+	warningsLevel := ctx.WarningsLevel
 	logger := ctx.GetLogger()
 
 	err = link(objectFiles, coreDotARelPath, coreArchiveFilePath, buildProperties, verbose, warningsLevel, logger)

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

@@ -46,7 +46,7 @@ func (s *SketchBuilder) Run(context map[string]interface{}, ctx *types.Context)
 	includes := context[constants.CTX_INCLUDE_FOLDERS].([]string)
 	includes = utils.Map(includes, utils.WrapWithHyphenI)
 	verbose := ctx.Verbose
-	warningsLevel := context[constants.CTX_WARNINGS_LEVEL].(string)
+	warningsLevel := ctx.WarningsLevel
 	logger := ctx.GetLogger()
 
 	err := utils.EnsureFolderExists(sketchBuildPath)

src/arduino.cc/builder/test/add_additional_entries_to_context_test.go

@@ -50,7 +50,7 @@ func TestAddAdditionalEntriesToContextNoBuildPath(t *testing.T) {
 	require.Empty(t, ctx.LibrariesBuildPath)
 	require.Empty(t, ctx.CoreBuildPath)
 
-	require.NotNil(t, context[constants.CTX_WARNINGS_LEVEL])
+	require.NotNil(t, ctx.WarningsLevel)
 
 	require.True(t, context[constants.CTX_COLLECTED_SOURCE_FILES_QUEUE].(*types.UniqueStringQueue).Empty())
 	require.True(t, context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE].(*types.UniqueSourceFolderQueue).Empty())
@@ -71,7 +71,7 @@ func TestAddAdditionalEntriesToContextWithBuildPath(t *testing.T) {
 	require.Equal(t, Abs(t, filepath.Join("folder", constants.FOLDER_LIBRARIES)), ctx.LibrariesBuildPath)
 	require.Equal(t, Abs(t, filepath.Join("folder", constants.FOLDER_CORE)), ctx.CoreBuildPath)
 
-	require.NotNil(t, context[constants.CTX_WARNINGS_LEVEL])
+	require.NotNil(t, ctx.WarningsLevel)
 
 	require.True(t, context[constants.CTX_COLLECTED_SOURCE_FILES_QUEUE].(*types.UniqueStringQueue).Empty())
 	require.True(t, context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE].(*types.UniqueSourceFolderQueue).Empty())

src/arduino.cc/builder/test/builder_test.go

@@ -203,7 +203,7 @@ func TestBuilderBridgeSAM(t *testing.T) {
 	buildPath := SetupBuildPath(t, ctx)
 	defer os.RemoveAll(buildPath)
 
-	context[constants.CTX_WARNINGS_LEVEL] = "all"
+	ctx.WarningsLevel = "all"
 
 	command := builder.Builder{}
 	err := command.Run(context, ctx)

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

@@ -22,6 +22,8 @@ type Context struct {
 	LibrariesBuildPath string
 	PreprocPath        string
 
+	WarningsLevel string
+
 	// Libraries handling
 	Includes          []string
 	Libraries         []*Library