Move const strings to constant package

facchinm · facchinm · commit 975a84a9bde7 · 2016-11-17T15:18:30.000+01:00
diff --git a/src/arduino.cc/builder/constants/constants.go b/src/arduino.cc/builder/constants/constants.go
@@ -170,6 +170,13 @@ const MSG_PROP_IN_LIBRARY = "Missing '{0}' from library in {1}"
 const MSG_RUNNING_COMMAND = "Ts: {0} - Running: {1}"
 const MSG_RUNNING_RECIPE = "Running recipe: {0}"
 const MSG_SETTING_BUILD_PATH = "Setting build path to {0}"
+const MSG_SIZER_TEXT_FULL = "Sketch uses {0} bytes ({2}%%) of program storage space. Maximum is {1} bytes."
+const MSG_SIZER_DATA_FULL = "Global variables use {0} bytes ({2}%%) of dynamic memory, leaving {3} bytes for local variables. Maximum is {1} bytes."
+const MSG_SIZER_DATA = "Global variables use {0} bytes of dynamic memory."
+const MSG_SIZER_TEXT_TOO_BIG = "Sketch too big; see http://www.arduino.cc/en/Guide/Troubleshooting#size for tips on reducing it."
+const MSG_SIZER_DATA_TOO_BIG = "Not enough memory; see http://www.arduino.cc/en/Guide/Troubleshooting#size for tips on reducing your footprint."
+const MSG_SIZER_LOW_MEMORY = "Low memory available, stability problems may occur."
+const MSG_SIZER_ERROR_NO_RULE = "Couldn't determine program size"
 const MSG_SKETCH_CANT_BE_IN_BUILDPATH = "Sketch cannot be located in build path. Please specify a different build path"
 const MSG_SKIPPING_TAG_ALREADY_DEFINED = "Skipping tag {0} because prototype is already defined"
 const MSG_SKIPPING_TAG_BECAUSE_HAS_FIELD = "Skipping tag {0} because it has field {0}"
@@ -197,6 +204,9 @@ const PLATFORM_REWRITE_NEW = "new"
 const PLATFORM_REWRITE_OLD = "old"
 const PLATFORM_URL = "url"
 const PLATFORM_VERSION = "version"
+const PROPERTY_WARN_DATA_PERCENT = "build.warn_data_percentage"
+const PROPERTY_UPLOAD_MAX_SIZE = "upload.maximum_size"
+const PROPERTY_UPLOAD_MAX_DATA_SIZE = "upload.maximum_data_size"
 const PROGRAMMER_NAME = "name"
 const RECIPE_AR_PATTERN = "recipe.ar.pattern"
 const RECIPE_C_COMBINE_PATTERN = "recipe.c.combine.pattern"
@@ -206,6 +216,9 @@ const RECIPE_SIZE_PATTERN = "recipe.size.pattern"
 const RECIPE_PREPROC_INCLUDES = "recipe.preproc.includes"
 const RECIPE_PREPROC_MACROS = "recipe.preproc.macros"
 const RECIPE_S_PATTERN = "recipe.S.o.pattern"
+const RECIPE_SIZE_REGEXP = "recipe.size.regex"
+const RECIPE_SIZE_REGEXP_DATA = "recipe.size.regex.data"
+const RECIPE_SIZE_REGEXP_EEPROM = "recipe.size.regex.eeprom"
 const REWRITING_DISABLED = "disabled"
 const REWRITING = "rewriting"
 const SPACE = " "
diff --git a/src/arduino.cc/builder/phases/sizer.go b/src/arduino.cc/builder/phases/sizer.go
@@ -33,7 +33,6 @@ import (
 	"errors"
 	"regexp"
 	"strconv"
-	"time"
 
 	"arduino.cc/builder/builder_utils"
 	"arduino.cc/builder/constants"
@@ -52,9 +51,6 @@ func (s *Sizer) Run(ctx *types.Context) error {
 
 	err := checkSize(buildProperties, verbose, warningsLevel, logger)
 	if err != nil {
-		// HACK: we are bailing out badly and we just wrote on stdout,
-		// wait 200 ms to let the IDE's MessageSiphon flush
-		time.Sleep(200 * time.Millisecond)
 		return i18n.WrapError(err)
 	}
 
@@ -66,15 +62,13 @@ func checkSize(buildProperties properties.Map, verbose bool, warningsLevel strin
 	properties := buildProperties.Clone()
 	properties[constants.BUILD_PROPERTIES_COMPILER_WARNING_FLAGS] = properties[constants.BUILD_PROPERTIES_COMPILER_WARNING_FLAGS+"."+warningsLevel]
 
-	maxTextSizeString := properties["upload.maximum_size"]
-	maxDataSizeString := properties["upload.maximum_data_size"]
+	maxTextSizeString := properties[constants.PROPERTY_UPLOAD_MAX_SIZE]
+	maxDataSizeString := properties[constants.PROPERTY_UPLOAD_MAX_DATA_SIZE]
 
 	if maxTextSizeString == "" {
 		return nil
 	}
 
-	logLevel := constants.LOG_LEVEL_INFO
-
 	maxTextSize, _ := strconv.Atoi(maxTextSizeString)
 	maxDataSize := -1
 
@@ -89,29 +83,29 @@ func checkSize(buildProperties properties.Map, verbose bool, warningsLevel strin
 		return err
 	}
 
-	logger.Println(logLevel, "Sketch uses {0} bytes ({2}%%) of program storage space. Maximum is {1} bytes.", strconv.Itoa(textSize), strconv.Itoa(maxTextSize), strconv.Itoa(textSize*100/maxTextSize))
+	logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_SIZER_TEXT_FULL, strconv.Itoa(textSize), strconv.Itoa(maxTextSize), strconv.Itoa(textSize*100/maxTextSize))
 	if dataSize > 0 {
 		if maxDataSize > 0 {
-			logger.Println(logLevel, "Global variables use {0} bytes ({2}%%) of dynamic memory, leaving {3} bytes for local variables. Maximum is {1} bytes.", strconv.Itoa(dataSize), strconv.Itoa(maxDataSize), strconv.Itoa(dataSize*100/maxDataSize), strconv.Itoa(maxDataSize-dataSize))
+			logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_SIZER_DATA_FULL, strconv.Itoa(dataSize), strconv.Itoa(maxDataSize), strconv.Itoa(dataSize*100/maxDataSize), strconv.Itoa(maxDataSize-dataSize))
 		} else {
-			logger.Println(logLevel, "Global variables use {0} bytes of dynamic memory.", strconv.Itoa(dataSize))
+			logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_SIZER_DATA, strconv.Itoa(dataSize))
 		}
 	}
 
 	if textSize > maxTextSize {
-		i18n.ErrorfWithLogger(logger, "Sketch too big; see http://www.arduino.cc/en/Guide/Troubleshooting#size for tips on reducing it.")
+		logger.Println(constants.LOG_LEVEL_ERROR, constants.MSG_SIZER_TEXT_TOO_BIG)
 		return errors.New("")
 	}
 
 	if maxDataSize > 0 && dataSize > maxDataSize {
-		i18n.ErrorfWithLogger(logger, "Not enough memory; see http://www.arduino.cc/en/Guide/Troubleshooting#size for tips on reducing your footprint.")
+		logger.Println(constants.LOG_LEVEL_ERROR, constants.MSG_SIZER_DATA_TOO_BIG)
 		return errors.New("")
 	}
 
-	if properties["build.warn_data_percentage"] != "" {
-		warnDataPercentage, _ := strconv.Atoi(properties["build.warn_data_percentage"])
+	if properties[constants.PROPERTY_WARN_DATA_PERCENT] != "" {
+		warnDataPercentage, _ := strconv.Atoi(properties[constants.PROPERTY_WARN_DATA_PERCENT])
 		if maxDataSize > 0 && dataSize > maxDataSize*warnDataPercentage/100 {
-			logger.Println(logLevel, "Low memory available, stability problems may occur.")
+			logger.Println(constants.LOG_LEVEL_WARN, constants.MSG_SIZER_LOW_MEMORY)
 		}
 	}
 
@@ -123,14 +117,14 @@ func execSizeReceipe(properties properties.Map, logger i18n.Logger, textSize *in
 	out, err := builder_utils.ExecRecipe(properties, constants.RECIPE_SIZE_PATTERN, false, false, false, logger)
 
 	if err != nil {
-		i18n.ErrorfWithLogger(logger, "Couldn't determine program size")
+		i18n.ErrorfWithLogger(logger, constants.MSG_SIZER_ERROR_NO_RULE)
 		return errors.New("")
 	}
 
 	// force multiline match prepending "(?m)" to the actual regexp
 
-	if len(properties["recipe.size.regex"]) > 0 {
-		textRegexp := regexp.MustCompile("(?m)" + properties["recipe.size.regex"])
+	if len(properties[constants.RECIPE_SIZE_REGEXP]) > 0 {
+		textRegexp := regexp.MustCompile("(?m)" + properties[constants.RECIPE_SIZE_REGEXP])
 		result := textRegexp.FindAllSubmatch(out, -1)
 		for _, b := range result {
 			for _, c := range b {
@@ -140,8 +134,8 @@ func execSizeReceipe(properties properties.Map, logger i18n.Logger, textSize *in
 		}
 	}
 
-	if len(properties["recipe.size.regex.data"]) > 0 {
-		dataRegexp := regexp.MustCompile("(?m)" + properties["recipe.size.regex.data"])
+	if len(properties[constants.RECIPE_SIZE_REGEXP_DATA]) > 0 {
+		dataRegexp := regexp.MustCompile("(?m)" + properties[constants.RECIPE_SIZE_REGEXP_DATA])
 		result := dataRegexp.FindAllSubmatch(out, -1)
 		for _, b := range result {
 			for _, c := range b {
@@ -151,8 +145,8 @@ func execSizeReceipe(properties properties.Map, logger i18n.Logger, textSize *in
 		}
 	}
 
-	if len(properties["recipe.size.regex.eeprom"]) > 0 {
-		eepromRegexp := regexp.MustCompile("(?m)" + properties["recipe.size.regex.eeprom"])
+	if len(properties[constants.RECIPE_SIZE_REGEXP_EEPROM]) > 0 {
+		eepromRegexp := regexp.MustCompile("(?m)" + properties[constants.RECIPE_SIZE_REGEXP_EEPROM])
 		result := eepromRegexp.FindAllSubmatch(out, -1)
 		for _, b := range result {
 			for _, c := range b {
