Removed a bunch of unused functions/identifiers

Author: cmaglie

add_additional_entries_to_context.go

@@ -40,7 +40,7 @@ import (
 
 type AddAdditionalEntriesToContext struct{}
 
-func (s *AddAdditionalEntriesToContext) Run(ctx *types.Context) error {
+func (*AddAdditionalEntriesToContext) Run(ctx *types.Context) error {
 	if ctx.BuildPath != "" {
 		buildPath := ctx.BuildPath
 		preprocPath, err := filepath.Abs(filepath.Join(buildPath, constants.FOLDER_PREPROC))

add_build_board_property_if_missing.go

@@ -39,7 +39,7 @@ import (
 
 type AddBuildBoardPropertyIfMissing struct{}
 
-func (s *AddBuildBoardPropertyIfMissing) Run(ctx *types.Context) error {
+func (*AddBuildBoardPropertyIfMissing) Run(ctx *types.Context) error {
 	packages := ctx.Hardware
 	logger := ctx.GetLogger()
 

arduino-builder/main.go

@@ -375,14 +375,6 @@ func toSliceOfUnquoted(value []string) ([]string, error) {
 	return values, nil
 }
 
-func printError(err error, printStackTrace bool) {
-	if printStackTrace {
-		printCompleteError(err)
-	} else {
-		printErrorMessageAndFlagUsage(err)
-	}
-}
-
 func printCompleteError(err error) {
 	err = i18n.WrapError(err)
 	fmt.Fprintln(os.Stderr, err.(*errors.Error).ErrorStack())

builder_utils/utils.go

@@ -355,7 +355,7 @@ func ArchiveCompiledFiles(buildPath string, archiveFile string, objectFiles []st
 }
 
 func ExecRecipe(properties properties.Map, recipe string, removeUnsetProperties bool, echoCommandLine bool, echoOutput bool, logger i18n.Logger) ([]byte, error) {
-	command, err := PrepareCommandForRecipe(properties, recipe, removeUnsetProperties, echoCommandLine, echoOutput, logger)
+	command, err := PrepareCommandForRecipe(properties, recipe, removeUnsetProperties, echoCommandLine, logger)
 	if err != nil {
 		return nil, i18n.WrapError(err)
 	}
@@ -375,7 +375,7 @@ func ExecRecipe(properties properties.Map, recipe string, removeUnsetProperties
 	return bytes, i18n.WrapError(err)
 }
 
-func PrepareCommandForRecipe(buildProperties properties.Map, recipe string, removeUnsetProperties bool, echoCommandLine bool, echoOutput bool, logger i18n.Logger) (*exec.Cmd, error) {
+func PrepareCommandForRecipe(buildProperties properties.Map, recipe string, removeUnsetProperties bool, echoCommandLine bool, logger i18n.Logger) (*exec.Cmd, error) {
 	pattern := buildProperties[recipe]
 	if pattern == constants.EMPTY_STRING {
 		return nil, i18n.ErrorfWithLogger(logger, constants.MSG_PATTERN_MISSING, recipe)
@@ -399,8 +399,8 @@ func PrepareCommandForRecipe(buildProperties properties.Map, recipe string, remo
 	return command, nil
 }
 
-func ExecRecipeCollectStdErr(buildProperties properties.Map, recipe string, removeUnsetProperties bool, echoCommandLine bool, echoOutput bool, logger i18n.Logger) (string, error) {
-	command, err := PrepareCommandForRecipe(buildProperties, recipe, removeUnsetProperties, echoCommandLine, echoOutput, logger)
+func ExecRecipeCollectStdErr(buildProperties properties.Map, recipe string, removeUnsetProperties bool, echoCommandLine bool, logger i18n.Logger) (string, error) {
+	command, err := PrepareCommandForRecipe(buildProperties, recipe, removeUnsetProperties, echoCommandLine, logger)
 	if err != nil {
 		return "", i18n.WrapError(err)
 	}

constants/constants.go

@@ -59,9 +59,7 @@ const BUILD_PROPERTIES_TOOLS_KEY = "tools"
 const BUILD_PROPERTIES_VID = "vid"
 const CTAGS = "ctags"
 const EMPTY_STRING = ""
-const FILE_BUILTIN_TOOLS_VERSIONS_TXT = "builtin_tools_versions.txt"
 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_INCLUDES_CACHE = "includes.cache"
 const FOLDER_BOOTLOADERS = "bootloaders"
@@ -128,7 +126,6 @@ const MSG_BUILD_OPTIONS_CHANGED = "Build options changed, rebuilding all"
 const MSG_CANT_FIND_SKETCH_IN_PATH = "Unable to find {0} in {1}"
 const MSG_FQBN_INVALID = "{0} is not a valid fully qualified board name. Required format is targetPackageName:targetPlatformName:targetBoardName."
 const MSG_INVALID_QUOTING = "Invalid quoting: no closing [{0}] char found."
-const MSG_IGNORED_BUILTIN_TOOLS_TXT = "Skipping {0}; please consider removing that file since it may hurt older Arduino installations"
 const MSG_LIB_LEGACY = "(legacy)"
 const MSG_LIBRARIES_MULTIPLE_LIBS_FOUND_FOR = "Multiple libraries were found for \"{0}\""
 const MSG_LIBRARIES_NOT_USED = " Not used: {0}"
@@ -138,7 +135,6 @@ const MSG_LIBRARY_INCOMPATIBLE_ARCH = "WARNING: library {0} claims to run on {1}
 const MSG_LOOKING_FOR_RECIPES = "Looking for recipes like {0}*{1}"
 const MSG_MISSING_BUILD_BOARD = "Warning: Board {0}:{1}:{2} doesn''t define a ''build.board'' preference. Auto-set to: {3}"
 const MSG_MISSING_CORE_FOR_BOARD = "Selected board depends on '{0}' core (not installed)."
-const MSG_MUST_BE_A_FOLDER = "{0} must be a folder"
 const MSG_PACKAGE_UNKNOWN = "{0}: Unknown package"
 const MSG_PATTERN_MISSING = "{0} pattern is missing"
 const MSG_PLATFORM_UNKNOWN = "Platform {0} (package {1}) is unknown"
@@ -155,10 +151,6 @@ const MSG_SIZER_DATA_TOO_BIG = "Not enough memory; see http://www.arduino.cc/en/
 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}"
-const MSG_SKIPPING_TAG_WITH_REASON = "Skipping tag {0}. Reason: {1}"
-const MSG_UNHANDLED_TYPE_IN_CONTEXT = "Unhandled type {0} in context key {1}"
 const MSG_UNKNOWN_SKETCH_EXT = "Unknown sketch file extension: {0}"
 const MSG_USING_LIBRARY_AT_VERSION = "Using library {0} at version {1} in folder: {2} {3}"
 const MSG_USING_LIBRARY = "Using library {0} in folder: {1} {2}"
@@ -167,30 +159,24 @@ const MSG_USING_CORE = "Using core '{0}' from platform in folder: {1}"
 const MSG_USING_PREVIOUS_COMPILED_FILE = "Using previously compiled file: {0}"
 const MSG_USING_CACHED_INCLUDES = "Using cached library dependencies for file: {0}"
 const MSG_WARNING_LIB_INVALID_CATEGORY = "WARNING: Category '{0}' in library {1} is not valid. Setting to '{2}'"
-const MSG_WARNING_PLATFORM_MISSING_VALUE = "Warning: platform.txt from core '{0}' misses property '{1}', using default value '{2}'. Consider upgrading this core."
 const MSG_WARNING_PLATFORM_OLD_VALUES = "Warning: platform.txt from core '{0}' contains deprecated {1}, automatically converted to {2}. Consider upgrading this core."
 const MSG_WARNING_SPURIOUS_FILE_IN_LIB = "WARNING: Spurious {0} folder in '{1}' library"
-const MSG_WRONG_PROPERTIES_FILE = "Property line '{0}' in file {1} is invalid"
-const MSG_WRONG_PROPERTIES = "Property line '{0}' is invalid"
 const PACKAGE_NAME = "name"
 const PACKAGE_TOOLS = "tools"
 const PLATFORM_ARCHITECTURE = "architecture"
 const PLATFORM_NAME = "name"
-const PLATFORM_REWRITE_ADDED = "added"
 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"
 const RECIPE_C_PATTERN = "recipe.c.o.pattern"
 const RECIPE_CPP_PATTERN = "recipe.cpp.o.pattern"
 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"

gcc_preproc_runner.go

@@ -90,7 +90,7 @@ func (s *GCCPreprocRunnerForDiscoveringIncludes) Run(ctx *types.Context) error {
 		properties[constants.RECIPE_PREPROC_MACROS] = GeneratePreprocPatternFromCompile(properties[constants.RECIPE_CPP_PATTERN])
 	}
 
-	stderr, err := builder_utils.ExecRecipeCollectStdErr(properties, constants.RECIPE_PREPROC_MACROS, true, verbose, false, logger)
+	stderr, err := builder_utils.ExecRecipeCollectStdErr(properties, constants.RECIPE_PREPROC_MACROS, true, verbose, logger)
 	if err != nil {
 		return i18n.WrapError(err)
 	}

gcc_preproc_source_saver.go

@@ -30,9 +30,10 @@
 package builder
 
 import (
+	"time"
+
 	"github.com/arduino/arduino-builder/constants"
 	"github.com/arduino/arduino-builder/types"
-	"time"
 )
 
 type PrintUsedLibrariesIfVerbose struct{}

print_used_libraries_if_verbose.go

@@ -130,15 +130,6 @@ func filterOutLibraryFrom(libraries []*types.Library, libraryToRemove *types.Lib
 	return filteredOutLibraries
 }
 
-func findLibraryIn(libraries []*types.Library, library *types.Library) *types.Library {
-	for _, lib := range libraries {
-		if lib == library {
-			return lib
-		}
-	}
-	return nil
-}
-
 func libraryCompatibleWithPlatform(library *types.Library, platform *cores.PlatformRelease) (bool, bool) {
 	if len(library.Archs) == 0 {
 		return true, true
@@ -173,20 +164,6 @@ func librariesCompatibleWithPlatform(libraries []*types.Library, platform *cores
 	return compatibleLibraries
 }
 
-func librariesWithinPlatform(libraries []*types.Library, platform *cores.PlatformRelease) []*types.Library {
-	librariesWithinSpecifiedPlatform := []*types.Library{}
-	for _, library := range libraries {
-		cleanPlatformFolder := filepath.Clean(platform.Folder)
-		cleanLibraryFolder := filepath.Clean(library.SrcFolder)
-		if strings.Contains(cleanLibraryFolder, cleanPlatformFolder) {
-			librariesWithinSpecifiedPlatform = append(librariesWithinSpecifiedPlatform, library)
-		}
-	}
-
-	return librariesWithinSpecifiedPlatform
-
-}
-
 func findBestLibraryWithHeader(header string, libraries []*types.Library) *types.Library {
 	headerName := strings.Replace(header, filepath.Ext(header), constants.EMPTY_STRING, -1)
 

resolve_library.go

@@ -69,7 +69,6 @@ type Context struct {
 	LibrariesResolutionResults map[string]LibraryResolutionResult
 	IncludeJustFound           string
 	IncludeFolders             []string
-	OutputGccMinusM            string
 
 	// C++ Parsing
 	CTagsOutput                 string

types/context.go

@@ -185,11 +185,6 @@ type PlatforKeyRewrite struct {
 	NewValue string
 }
 
-type KeyValuePair struct {
-	Key   string
-	Value string
-}
-
 type Prototype struct {
 	FunctionName string
 	File         string
@@ -226,7 +221,6 @@ type CTag struct {
 	Signature    string
 
 	Prototype          string
-	Function           string
 	PrototypeModifiers string
 }
 

types/types.go

@@ -46,14 +46,6 @@ import (
 	"github.com/arduino/arduino-builder/types"
 )
 
-func KeysOfMapOfStringInterface(input map[string]interface{}) []string {
-	var keys []string
-	for key, _ := range input {
-		keys = append(keys, key)
-	}
-	return keys
-}
-
 func KeysOfMapOfString(input map[string]string) []string {
 	var keys []string
 	for key, _ := range input {
@@ -254,24 +246,11 @@ func PrepareCommand(pattern string, logger i18n.Logger) (*exec.Cmd, error) {
 	return PrepareCommandFilteredArgs(pattern, filterEmptyArg, logger)
 }
 
-func MapHas(aMap map[string]interface{}, key string) bool {
-	_, ok := aMap[key]
-	return ok
-}
-
 func MapStringStringHas(aMap map[string]string, key string) bool {
 	_, ok := aMap[key]
 	return ok
 }
 
-func SliceToMapStringBool(keys []string, value bool) map[string]bool {
-	aMap := make(map[string]bool)
-	for _, key := range keys {
-		aMap[key] = value
-	}
-	return aMap
-}
-
 func AbsolutizePaths(files []string) ([]string, error) {
 	for idx, file := range files {
 		absFile, err := filepath.Abs(file)
@@ -295,32 +274,6 @@ func ReadFileToRows(file string) ([]string, error) {
 	return strings.Split(txt, "\n"), nil
 }
 
-func TheOnlySubfolderOf(folder string) (string, error) {
-	subfolders, err := ReadDirFiltered(folder, FilterDirs)
-	if err != nil {
-		return constants.EMPTY_STRING, i18n.WrapError(err)
-	}
-
-	if len(subfolders) != 1 {
-		return constants.EMPTY_STRING, nil
-	}
-
-	return subfolders[0].Name(), nil
-}
-
-func FilterOutFoldersByNames(folders []os.FileInfo, names ...string) []os.FileInfo {
-	filterNames := SliceToMapStringBool(names, true)
-
-	var filtered []os.FileInfo
-	for _, folder := range folders {
-		if !filterNames[folder.Name()] {
-			filtered = append(filtered, folder)
-		}
-	}
-
-	return filtered
-}
-
 type CheckExtensionFunc func(ext string) bool
 
 func FindFilesInFolder(files *[]string, folder string, extensions CheckExtensionFunc, recurse bool) error {
@@ -430,10 +383,6 @@ func LogIfVerbose(level string, format string, args ...interface{}) types.Comman
 	return &loggerAction{true, level, format, args}
 }
 
-func LogThis(level string, format string, args ...interface{}) types.Command {
-	return &loggerAction{false, level, format, args}
-}
-
 // Returns the given string as a quoted string for use with the C
 // preprocessor. This adds double quotes around it and escapes any
 // double quotes and backslashes in the string.