Removed a bunch of constants

constants/constants.go

@@ -37,66 +37,39 @@ const BUILD_PROPERTIES_ARCHIVE_FILE_PATH = "archive_file_path"
 const BUILD_PROPERTIES_ARCH_OVERRIDE_CHECK = "architecture.override_check"
 const BUILD_PROPERTIES_BOOTLOADER_FILE = "bootloader.file"
 const BUILD_PROPERTIES_BOOTLOADER_NOBLINK = "bootloader.noblink"
-const BUILD_PROPERTIES_BUILD_ARCH = "build.arch"
 const BUILD_PROPERTIES_BUILD_BOARD = "build.board"
 const BUILD_PROPERTIES_BUILD_CORE = "build.core"
 const BUILD_PROPERTIES_BUILD_CORE_PATH = "build.core.path"
 const BUILD_PROPERTIES_BUILD_MCU = "build.mcu"
-const BUILD_PROPERTIES_BUILD_PATH = "build.path"
-const BUILD_PROPERTIES_BUILD_PROJECT_NAME = "build.project_name"
-const BUILD_PROPERTIES_BUILD_SYSTEM_PATH = "build.system.path"
-const BUILD_PROPERTIES_BUILD_VARIANT = "build.variant"
 const BUILD_PROPERTIES_BUILD_VARIANT_PATH = "build.variant.path"
 const BUILD_PROPERTIES_COMPILER_C_ELF_FLAGS = "compiler.c.elf.flags"
 const BUILD_PROPERTIES_COMPILER_C_ELF_EXTRAFLAGS = "compiler.c.elf.extra_flags"
 const BUILD_PROPERTIES_COMPILER_CPP_FLAGS = "compiler.cpp.flags"
-const BUILD_PROPERTIES_COMPILER_PATH = "compiler.path"
 const BUILD_PROPERTIES_COMPILER_WARNING_FLAGS = "compiler.warning_flags"
-const BUILD_PROPERTIES_EXTRA_TIME_DST = "extra.time.dst"
-const BUILD_PROPERTIES_EXTRA_TIME_LOCAL = "extra.time.local"
-const BUILD_PROPERTIES_EXTRA_TIME_UTC = "extra.time.utc"
-const BUILD_PROPERTIES_EXTRA_TIME_ZONE = "extra.time.zone"
 const BUILD_PROPERTIES_FQBN = "build.fqbn"
 const BUILD_PROPERTIES_INCLUDES = "includes"
 const BUILD_PROPERTIES_OBJECT_FILE = "object_file"
 const BUILD_PROPERTIES_OBJECT_FILES = "object_files"
 const BUILD_PROPERTIES_PATTERN = "pattern"
 const BUILD_PROPERTIES_PID = "pid"
 const BUILD_PROPERTIES_PREPROCESSED_FILE_PATH = "preprocessed_file_path"
-const BUILD_PROPERTIES_RUNTIME_HARDWARE_PATH = "runtime.hardware.path"
-const BUILD_PROPERTIES_RUNTIME_OS = "runtime.os"
 const BUILD_PROPERTIES_RUNTIME_PLATFORM_PATH = "runtime.platform.path"
-const BUILD_PROPERTIES_RUNTIME_TOOLS_PREFIX = "runtime.tools."
-const BUILD_PROPERTIES_RUNTIME_TOOLS_SUFFIX = ".path"
-const BUILD_PROPERTIES_RUNTIME_IDE_VERSION = "runtime.ide.version"
-const BUILD_PROPERTIES_SOFTWARE = "software"
 const BUILD_PROPERTIES_SOURCE_FILE = "source_file"
-const BUILD_PROPERTIES_SOURCE_PATH = "build.source.path"
 const BUILD_PROPERTIES_TOOLS_KEY = "tools"
 const BUILD_PROPERTIES_VID = "vid"
 const CTAGS = "ctags"
 const EMPTY_STRING = ""
-const FILE_BOARDS_LOCAL_TXT = "boards.local.txt"
-const FILE_BOARDS_TXT = "boards.txt"
 const FILE_BUILTIN_TOOLS_VERSIONS_TXT = "builtin_tools_versions.txt"
-const FILE_CTAGS_TARGET = "ctags_target.cpp"
 const FILE_CTAGS_TARGET_FOR_GCC_MINUS_E = "ctags_target_for_gcc_minus_e.cpp"
 const FILE_GCC_PREPROC_TARGET = "gcc_preproc_target.cpp"
 const FILE_PLATFORM_KEYS_REWRITE_TXT = "platform.keys.rewrite.txt"
-const FILE_PLATFORM_LOCAL_TXT = "platform.local.txt"
-const FILE_PLATFORM_TXT = "platform.txt"
-const FILE_PROGRAMMERS_TXT = "programmers.txt"
 const FILE_INCLUDES_CACHE = "includes.cache"
 const FOLDER_BOOTLOADERS = "bootloaders"
 const FOLDER_CORE = "core"
-const FOLDER_CORES = "cores"
-const FOLDER_HARDWARE = "hardware"
 const FOLDER_LIBRARIES = "libraries"
 const FOLDER_PREPROC = "preproc"
 const FOLDER_SKETCH = "sketch"
-const FOLDER_SYSTEM = "system"
 const FOLDER_TOOLS = "tools"
-const FOLDER_VARIANTS = "variants"
 const hooks_core = hooks + ".core"
 const HOOKS_CORE_POSTBUILD = hooks_core + hooks_postbuild_suffix
 const HOOKS_CORE_PREBUILD = hooks_core + hooks_prebuild_suffix
@@ -122,8 +95,6 @@ const hooks = "recipe.hooks"
 const hooks_sketch = hooks + ".sketch"
 const HOOKS_SKETCH_POSTBUILD = hooks_sketch + hooks_postbuild_suffix
 const HOOKS_SKETCH_PREBUILD = hooks_sketch + hooks_prebuild_suffix
-const IDE_VERSION = "ide_version"
-const ID = "_id"
 const LIB_CATEGORY_UNCATEGORIZED = "Uncategorized"
 const LIB_LICENSE_UNSPECIFIED = "Unspecified"
 const LIBRARY_ALL_ARCHS = "*"

setup_build_properties.go

@@ -35,7 +35,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/arduino/arduino-builder/constants"
 	"github.com/arduino/arduino-builder/types"
 	"github.com/arduino/arduino-builder/utils"
 	"github.com/arduino/go-properties-map"
@@ -58,26 +57,26 @@ func (s *SetupBuildProperties) Run(ctx *types.Context) error {
 	buildProperties.Merge(targetBoard.Properties)
 
 	if ctx.BuildPath != "" {
-		buildProperties[constants.BUILD_PROPERTIES_BUILD_PATH] = ctx.BuildPath
+		buildProperties["build.path"] = ctx.BuildPath
 	}
 	if ctx.Sketch != nil {
-		buildProperties[constants.BUILD_PROPERTIES_BUILD_PROJECT_NAME] = filepath.Base(ctx.Sketch.MainFile.Name)
+		buildProperties["build.project_name"] = filepath.Base(ctx.Sketch.MainFile.Name)
 	}
-	buildProperties[constants.BUILD_PROPERTIES_BUILD_ARCH] = strings.ToUpper(targetPlatform.Platform.Architecture)
-
-	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
-	buildProperties[constants.BUILD_PROPERTIES_RUNTIME_HARDWARE_PATH] = filepath.Join(targetPlatform.Folder, "..")
-	buildProperties[constants.BUILD_PROPERTIES_RUNTIME_IDE_VERSION] = ctx.ArduinoAPIVersion
-	buildProperties[constants.BUILD_PROPERTIES_FQBN] = ctx.FQBN
-	buildProperties[constants.IDE_VERSION] = ctx.ArduinoAPIVersion
-	buildProperties[constants.BUILD_PROPERTIES_RUNTIME_OS] = utils.PrettyOSName()
-
-	variant := buildProperties[constants.BUILD_PROPERTIES_BUILD_VARIANT]
-	if variant == constants.EMPTY_STRING {
-		buildProperties[constants.BUILD_PROPERTIES_BUILD_VARIANT_PATH] = constants.EMPTY_STRING
+	buildProperties["build.arch"] = strings.ToUpper(targetPlatform.Platform.Architecture)
+
+	buildProperties["build.core"] = ctx.BuildCore
+	buildProperties["build.core.path"] = filepath.Join(actualPlatform.Folder, "cores", buildProperties["build.core"])
+	buildProperties["build.system.path"] = filepath.Join(actualPlatform.Folder, "system")
+	buildProperties["runtime.platform.path"] = targetPlatform.Folder
+	buildProperties["runtime.hardware.path"] = filepath.Join(targetPlatform.Folder, "..")
+	buildProperties["runtime.ide.version"] = ctx.ArduinoAPIVersion
+	buildProperties["build.fqbn"] = ctx.FQBN
+	buildProperties["ide_version"] = ctx.ArduinoAPIVersion
+	buildProperties["runtime.os"] = utils.PrettyOSName()
+
+	variant := buildProperties["build.variant"]
+	if variant == "" {
+		buildProperties["build.variant.path"] = ""
 	} else {
 		var variantPlatform *cores.PlatformRelease
 		variantParts := strings.Split(variant, ":")
@@ -87,17 +86,17 @@ func (s *SetupBuildProperties) Run(ctx *types.Context) error {
 		} else {
 			variantPlatform = targetPlatform
 		}
-		buildProperties[constants.BUILD_PROPERTIES_BUILD_VARIANT_PATH] = filepath.Join(variantPlatform.Folder, constants.FOLDER_VARIANTS, variant)
+		buildProperties["build.variant.path"] = filepath.Join(variantPlatform.Folder, "variants", variant)
 	}
 
 	tools := ctx.Tools
 	for _, tool := range tools {
-		buildProperties[constants.BUILD_PROPERTIES_RUNTIME_TOOLS_PREFIX+tool.Name+constants.BUILD_PROPERTIES_RUNTIME_TOOLS_SUFFIX] = tool.Folder
-		buildProperties[constants.BUILD_PROPERTIES_RUNTIME_TOOLS_PREFIX+tool.Name+"-"+tool.Version+constants.BUILD_PROPERTIES_RUNTIME_TOOLS_SUFFIX] = tool.Folder
+		buildProperties["runtime.tools."+tool.Name+".path"] = tool.Folder
+		buildProperties["runtime.tools."+tool.Name+"-"+tool.Version+".path"] = tool.Folder
 	}
 
-	if !utils.MapStringStringHas(buildProperties, constants.BUILD_PROPERTIES_SOFTWARE) {
-		buildProperties[constants.BUILD_PROPERTIES_SOFTWARE] = DEFAULT_SOFTWARE
+	if !utils.MapStringStringHas(buildProperties, "software") {
+		buildProperties["software"] = DEFAULT_SOFTWARE
 	}
 
 	if ctx.SketchLocation != "" {
@@ -106,14 +105,14 @@ func (s *SetupBuildProperties) Run(ctx *types.Context) error {
 			return err
 		}
 		sourcePath = filepath.Dir(sourcePath)
-		buildProperties[constants.BUILD_PROPERTIES_SOURCE_PATH] = sourcePath
+		buildProperties["build.source.path"] = sourcePath
 	}
 
 	now := time.Now()
-	buildProperties[constants.BUILD_PROPERTIES_EXTRA_TIME_UTC] = strconv.FormatInt(now.Unix(), 10)
-	buildProperties[constants.BUILD_PROPERTIES_EXTRA_TIME_LOCAL] = strconv.FormatInt(timeutils.LocalUnix(now), 10)
-	buildProperties[constants.BUILD_PROPERTIES_EXTRA_TIME_ZONE] = strconv.Itoa(timeutils.TimezoneOffsetNoDST(now))
-	buildProperties[constants.BUILD_PROPERTIES_EXTRA_TIME_DST] = strconv.Itoa(timeutils.DaylightSavingsOffset(now))
+	buildProperties["extra.time.utc"] = strconv.FormatInt(now.Unix(), 10)
+	buildProperties["extra.time.local"] = strconv.FormatInt(timeutils.LocalUnix(now), 10)
+	buildProperties["extra.time.zone"] = strconv.Itoa(timeutils.TimezoneOffsetNoDST(now))
+	buildProperties["extra.time.dst"] = strconv.Itoa(timeutils.DaylightSavingsOffset(now))
 
 	ctx.BuildProperties = buildProperties
 

test/ctags_runner_test.go

@@ -36,7 +36,6 @@ import (
 	"testing"
 
 	"github.com/arduino/arduino-builder"
-	"github.com/arduino/arduino-builder/constants"
 	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 )
@@ -70,7 +69,7 @@ func TestCTagsRunner(t *testing.T) {
 
 		&builder.PrintUsedLibrariesIfVerbose{},
 		&builder.WarnAboutArchIncompatibleLibraries{},
-		&builder.CTagsTargetFileSaver{Source: &ctx.Source, TargetFileName: constants.FILE_CTAGS_TARGET},
+		&builder.CTagsTargetFileSaver{Source: &ctx.Source, TargetFileName: "ctags_target.cpp"},
 		&builder.CTagsRunner{},
 	}
 
@@ -120,7 +119,7 @@ func TestCTagsRunnerSketchWithClass(t *testing.T) {
 
 		&builder.PrintUsedLibrariesIfVerbose{},
 		&builder.WarnAboutArchIncompatibleLibraries{},
-		&builder.CTagsTargetFileSaver{Source: &ctx.Source, TargetFileName: constants.FILE_CTAGS_TARGET},
+		&builder.CTagsTargetFileSaver{Source: &ctx.Source, TargetFileName: "ctags_target.cpp"},
 		&builder.CTagsRunner{},
 	}
 
@@ -168,7 +167,7 @@ func TestCTagsRunnerSketchWithTypename(t *testing.T) {
 
 		&builder.PrintUsedLibrariesIfVerbose{},
 		&builder.WarnAboutArchIncompatibleLibraries{},
-		&builder.CTagsTargetFileSaver{Source: &ctx.Source, TargetFileName: constants.FILE_CTAGS_TARGET},
+		&builder.CTagsTargetFileSaver{Source: &ctx.Source, TargetFileName: "ctags_target.cpp"},
 		&builder.CTagsRunner{},
 	}
 
@@ -215,7 +214,7 @@ func TestCTagsRunnerSketchWithNamespace(t *testing.T) {
 
 		&builder.PrintUsedLibrariesIfVerbose{},
 		&builder.WarnAboutArchIncompatibleLibraries{},
-		&builder.CTagsTargetFileSaver{Source: &ctx.Source, TargetFileName: constants.FILE_CTAGS_TARGET},
+		&builder.CTagsTargetFileSaver{Source: &ctx.Source, TargetFileName: "ctags_target.cpp"},
 		&builder.CTagsRunner{},
 	}
 
@@ -261,7 +260,7 @@ func TestCTagsRunnerSketchWithTemplates(t *testing.T) {
 
 		&builder.PrintUsedLibrariesIfVerbose{},
 		&builder.WarnAboutArchIncompatibleLibraries{},
-		&builder.CTagsTargetFileSaver{Source: &ctx.Source, TargetFileName: constants.FILE_CTAGS_TARGET},
+		&builder.CTagsTargetFileSaver{Source: &ctx.Source, TargetFileName: "ctags_target.cpp"},
 		&builder.CTagsRunner{},
 	}
 

test/hardware_loader_test.go

@@ -35,7 +35,6 @@ import (
 	"testing"
 
 	"github.com/arduino/arduino-builder"
-	"github.com/arduino/arduino-builder/constants"
 	"github.com/arduino/arduino-builder/types"
 	"github.com/arduino/arduino-builder/utils"
 	"github.com/stretchr/testify/require"
@@ -61,7 +60,7 @@ func TestLoadHardware(t *testing.T) {
 	require.Equal(t, 2, len(packages.Packages["arduino"].Platforms))
 
 	require.Equal(t, "uno", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["uno"].BoardId)
-	require.Equal(t, "uno", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["uno"].Properties[constants.ID])
+	require.Equal(t, "uno", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["uno"].Properties["_id"])
 
 	require.Equal(t, "yun", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["yun"].BoardId)
 	require.Equal(t, "true", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["yun"].Properties["upload.wait_for_upload_port"])
@@ -73,11 +72,11 @@ func TestLoadHardware(t *testing.T) {
 	require.Equal(t, "ATmega123", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["diecimila"].Properties["menu.cpu.atmega123"])
 
 	avrPlatform := packages.Packages["arduino"].Platforms["avr"]
-	require.Equal(t, "Arduino AVR Boards", avrPlatform.Releases[""].Properties[constants.PLATFORM_NAME])
+	require.Equal(t, "Arduino AVR Boards", avrPlatform.Releases[""].Properties["name"])
 	require.Equal(t, "-v", avrPlatform.Releases[""].Properties["tools.avrdude.bootloader.params.verbose"])
 	require.Equal(t, "/my/personal/avrdude", avrPlatform.Releases[""].Properties["tools.avrdude.cmd.path"])
 
-	require.Equal(t, "AVRISP mkII", avrPlatform.Releases[""].Programmers["avrispmkii"][constants.PROGRAMMER_NAME])
+	require.Equal(t, "AVRISP mkII", avrPlatform.Releases[""].Programmers["avrispmkii"]["name"])
 
 	//require.Equal(t, "{runtime.tools.ctags.path}", packages.Properties["tools.ctags.path"])
 	//require.Equal(t, "\"{cmd.path}\" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns --line-directives \"{source_file}\"", packages.Properties["tools.ctags.pattern"])
@@ -115,7 +114,7 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
 	require.Equal(t, 2, len(packages.Packages["arduino"].Platforms))
 
 	require.Equal(t, "uno", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["uno"].BoardId)
-	require.Equal(t, "uno", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["uno"].Properties[constants.ID])
+	require.Equal(t, "uno", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["uno"].Properties["_id"])
 
 	require.Equal(t, "yun", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["yun"].BoardId)
 	require.Equal(t, "true", packages.Packages["arduino"].Platforms["avr"].Releases[""].Boards["yun"].Properties["upload.wait_for_upload_port"])
@@ -125,15 +124,15 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
 	require.Equal(t, "arduino_due_x", packages.Packages["arduino"].Platforms["sam"].Releases[""].Boards["arduino_due_x"].BoardId)
 
 	avrPlatform := packages.Packages["arduino"].Platforms["avr"].Releases[""]
-	require.Equal(t, "Arduino AVR Boards", avrPlatform.Properties[constants.PLATFORM_NAME])
+	require.Equal(t, "Arduino AVR Boards", avrPlatform.Properties["name"])
 	require.Equal(t, "-v", avrPlatform.Properties["tools.avrdude.bootloader.params.verbose"])
 	require.Equal(t, "/my/personal/avrdude", avrPlatform.Properties["tools.avrdude.cmd.path"])
 
-	require.Equal(t, "AVRISP mkII", avrPlatform.Programmers["avrispmkii"][constants.PROGRAMMER_NAME])
+	require.Equal(t, "AVRISP mkII", avrPlatform.Programmers["avrispmkii"]["name"])
 
 	require.Equal(t, "-w -x c++ -M -MG -MP", avrPlatform.Properties["preproc.includes.flags"])
 	require.Equal(t, "-w -x c++ -E -CC", avrPlatform.Properties["preproc.macros.flags"])
-	require.Equal(t, "\"{compiler.path}{compiler.cpp.cmd}\" {compiler.cpp.flags} {preproc.includes.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {includes} \"{source_file}\"", avrPlatform.Properties[constants.RECIPE_PREPROC_INCLUDES])
+	require.Equal(t, "\"{compiler.path}{compiler.cpp.cmd}\" {compiler.cpp.flags} {preproc.includes.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {includes} \"{source_file}\"", avrPlatform.Properties["recipe.preproc.includes"])
 	require.False(t, utils.MapStringStringHas(avrPlatform.Properties, "preproc.macros.compatibility_flags"))
 
 	require.NotNil(t, packages.Packages["my_avr_platform"])
@@ -182,25 +181,25 @@ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
 	require.Equal(t, 3, len(samdPlatform.Boards))
 
 	require.Equal(t, "arduino_zero_edbg", samdPlatform.Boards["arduino_zero_edbg"].BoardId)
-	require.Equal(t, "arduino_zero_edbg", samdPlatform.Boards["arduino_zero_edbg"].Properties[constants.ID])
+	require.Equal(t, "arduino_zero_edbg", samdPlatform.Boards["arduino_zero_edbg"].Properties["_id"])
 
 	require.Equal(t, "arduino_zero", samdPlatform.Boards["arduino_zero_native"].Properties["build.variant"])
 	require.Equal(t, "-D__SAMD21G18A__ {build.usb_flags}", samdPlatform.Boards["arduino_zero_native"].Properties["build.extra_flags"])
 
-	require.Equal(t, "Arduino SAMD (32-bits ARM Cortex-M0+) Boards", samdPlatform.Properties[constants.PLATFORM_NAME])
+	require.Equal(t, "Arduino SAMD (32-bits ARM Cortex-M0+) Boards", samdPlatform.Properties["name"])
 	require.Equal(t, "-d3", samdPlatform.Properties["tools.openocd.erase.params.verbose"])
 
 	require.Equal(t, 3, len(samdPlatform.Programmers))
 
-	require.Equal(t, "Atmel EDBG", samdPlatform.Programmers["edbg"][constants.PROGRAMMER_NAME])
+	require.Equal(t, "Atmel EDBG", samdPlatform.Programmers["edbg"]["name"])
 	require.Equal(t, "openocd", samdPlatform.Programmers["edbg"]["program.tool"])
 
 	avrRedBearPlatform := packages.Packages["RedBearLab"].Platforms["avr"].Releases["1.0.0"]
 	require.Equal(t, 3, len(avrRedBearPlatform.Boards))
 
 	require.Equal(t, "blend", avrRedBearPlatform.Boards["blend"].BoardId)
-	require.Equal(t, "blend", avrRedBearPlatform.Boards["blend"].Properties[constants.ID])
-	require.Equal(t, "arduino:arduino", avrRedBearPlatform.Boards["blend"].Properties[constants.BUILD_PROPERTIES_BUILD_CORE])
+	require.Equal(t, "blend", avrRedBearPlatform.Boards["blend"].Properties["_id"])
+	require.Equal(t, "arduino:arduino", avrRedBearPlatform.Boards["blend"].Properties["build.core"])
 }
 
 func TestLoadLotsOfHardware(t *testing.T) {

test/load_vid_pid_specific_properties_test.go

@@ -30,12 +30,13 @@
 package test
 
 import (
-	"github.com/arduino/arduino-builder"
-	"github.com/arduino/arduino-builder/types"
-	"github.com/stretchr/testify/require"
 	"os"
 	"path/filepath"
 	"testing"
+
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/stretchr/testify/require"
 )
 
 func TestLoadVIDPIDSpecificPropertiesWhenNoVIDPIDAreProvided(t *testing.T) {

test/platform_keys_rewrite_loader_test.go

@@ -30,12 +30,12 @@
 package test
 
 import (
+	"path/filepath"
+	"testing"
+
 	"github.com/arduino/arduino-builder"
-	"github.com/arduino/arduino-builder/constants"
 	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
-	"path/filepath"
-	"testing"
 )
 
 func TestLoadPlatformKeysRewrite(t *testing.T) {
@@ -55,15 +55,15 @@ func TestLoadPlatformKeysRewrite(t *testing.T) {
 	platformKeysRewrite := ctx.PlatformKeyRewrites
 
 	require.Equal(t, 13, len(platformKeysRewrite.Rewrites))
-	require.Equal(t, constants.BUILD_PROPERTIES_COMPILER_PATH, platformKeysRewrite.Rewrites[0].Key)
+	require.Equal(t, "compiler.path", platformKeysRewrite.Rewrites[0].Key)
 	require.Equal(t, "{runtime.ide.path}/hardware/tools/avr/bin/", platformKeysRewrite.Rewrites[0].OldValue)
 	require.Equal(t, "{runtime.tools.avr-gcc.path}/bin/", platformKeysRewrite.Rewrites[0].NewValue)
 
 	require.Equal(t, "tools.avrdude.cmd.path", platformKeysRewrite.Rewrites[1].Key)
 	require.Equal(t, "{runtime.ide.path}/hardware/tools/avr/bin/avrdude", platformKeysRewrite.Rewrites[1].OldValue)
 	require.Equal(t, "{path}/bin/avrdude", platformKeysRewrite.Rewrites[1].NewValue)
 
-	require.Equal(t, constants.BUILD_PROPERTIES_COMPILER_PATH, platformKeysRewrite.Rewrites[3].Key)
+	require.Equal(t, "compiler.path", platformKeysRewrite.Rewrites[3].Key)
 	require.Equal(t, "{runtime.ide.path}/hardware/tools/gcc-arm-none-eabi-4.8.3-2014q1/bin/", platformKeysRewrite.Rewrites[3].OldValue)
 	require.Equal(t, "{runtime.tools.arm-none-eabi-gcc.path}/bin/", platformKeysRewrite.Rewrites[3].NewValue)