lib-discovery-recursion-depth is not needed since 1.2.0. Hence removing CLI param

Signed-off-by: Federico Fissore <[email protected]>

Author: Federico Fissore

README.md

@@ -35,8 +35,6 @@ This tool generates function prototypes and gathers library paths, providing `gc
 
 * `-logger`: Optional, can be "human" or "machine". Defaults to "human". If "machine", messages emitted will be in a format which the Arduino IDE understands and that it uses for I18N.
 
-* `-lib-discovery-recursion-depth`: Optional. Defaults to 4. How deep should library discovery go down looking for included libraries.
-
 * `-version`: if specified, prints version and exits.
 
 * `-build-options-file`: it specifies path to a local `build.options.json` file (see paragraph below), which allows you to omit specifying params such as `-hardware`, `-tools`, `-libraries`, `-fqbn`, `-pref` and `-ide-version`.

main.go

@@ -72,7 +72,6 @@ const FLAG_WARNINGS_ALL = "all"
 const FLAG_LOGGER = "logger"
 const FLAG_LOGGER_HUMAN = "human"
 const FLAG_LOGGER_MACHINE = "machine"
-const FLAG_LIB_DISCOVERY_RECURSION_PATH = "lib-discovery-recursion-depth"
 const FLAG_VERSION = "version"
 const FLAG_VID_PID = "vid-pid"
 
@@ -113,7 +112,6 @@ var buildPathFlag *string
 var verboseFlag *bool
 var quietFlag *bool
 var debugLevelFlag *int
-var libraryDiscoveryRecursionDepthFlag *int
 var warningsLevelFlag *string
 var loggerFlag *string
 var versionFlag *bool
@@ -137,7 +135,6 @@ func init() {
 	debugLevelFlag = flag.Int(FLAG_DEBUG_LEVEL, builder.DEFAULT_DEBUG_LEVEL, "Turns on debugging messages. The higher, the chattier")
 	warningsLevelFlag = flag.String(FLAG_WARNINGS, "", "Sets warnings level. Available values are '"+FLAG_WARNINGS_NONE+"', '"+FLAG_WARNINGS_DEFAULT+"', '"+FLAG_WARNINGS_MORE+"' and '"+FLAG_WARNINGS_ALL+"'")
 	loggerFlag = flag.String(FLAG_LOGGER, FLAG_LOGGER_HUMAN, "Sets type of logger. Available values are '"+FLAG_LOGGER_HUMAN+"', '"+FLAG_LOGGER_MACHINE+"'")
-	libraryDiscoveryRecursionDepthFlag = flag.Int(FLAG_LIB_DISCOVERY_RECURSION_PATH, builder.DEFAULT_LIBRARY_DISCOVERY_RECURSION_DEPTH, "How deep should library discovery go down looking for included libraries")
 	versionFlag = flag.Bool(FLAG_VERSION, false, "prints version and exits")
 	vidPidFlag = flag.String(FLAG_VID_PID, "", "specify to use vid/pid specific build properties, as defined in boards.txt")
 }
@@ -292,10 +289,6 @@ func main() {
 		context[constants.CTX_DEBUG_LEVEL] = *debugLevelFlag
 	}
 
-	if *libraryDiscoveryRecursionDepthFlag > 0 {
-		context[constants.CTX_LIBRARY_DISCOVERY_RECURSION_DEPTH] = *libraryDiscoveryRecursionDepthFlag
-	}
-
 	if *quietFlag {
 		context[constants.CTX_LOGGER] = i18n.NoopLogger{}
 	} else if *loggerFlag == FLAG_LOGGER_MACHINE {

src/arduino.cc/builder/add_additional_entries_to_context.go

@@ -76,10 +76,6 @@ func (s *AddAdditionalEntriesToContext) Run(context map[string]interface{}) erro
 		context[constants.CTX_DEBUG_LEVEL] = DEFAULT_DEBUG_LEVEL
 	}
 
-	if !utils.MapHas(context, constants.CTX_LIBRARY_DISCOVERY_RECURSION_DEPTH) {
-		context[constants.CTX_LIBRARY_DISCOVERY_RECURSION_DEPTH] = DEFAULT_LIBRARY_DISCOVERY_RECURSION_DEPTH
-	}
-
 	sourceFiles := &types.UniqueStringQueue{}
 	context[constants.CTX_COLLECTED_SOURCE_FILES_QUEUE] = sourceFiles
 	foldersWithSources := &types.UniqueSourceFolderQueue{}

src/arduino.cc/builder/builder.go

@@ -62,7 +62,6 @@ const DEFAULT_DEBUG_LEVEL = 5
 const DEFAULT_WARNINGS_LEVEL = "none"
 const DEFAULT_SOFTWARE = "ARDUINO"
 const DEFAULT_BUILD_CORE = "arduino"
-const DEFAULT_LIBRARY_DISCOVERY_RECURSION_DEPTH = 4
 
 type Builder struct{}
 

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

@@ -109,7 +109,6 @@ const CTX_INCLUDES_JUST_FOUND = "includesJustFound"
 const CTX_LIBRARIES_BUILD_PATH = "librariesBuildPath"
 const CTX_LIBRARIES_FOLDERS = "librariesFolders"
 const CTX_LIBRARIES = "libraries"
-const CTX_LIBRARY_DISCOVERY_RECURSION_DEPTH = "libraryDiscoveryRecursionDepth"
 const CTX_LIBRARY_RESOLUTION_RESULTS = "libraryResolutionResults"
 const CTX_LINE_OFFSET = "lineOffset"
 const CTX_LINE_WHERE_TO_INSERT_PROTOTYPES = "lineWhereToInsertPrototypes"

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

@@ -52,7 +52,6 @@ func TestAddAdditionalEntriesToContextNoBuildPath(t *testing.T) {
 	require.NotNil(t, context[constants.CTX_WARNINGS_LEVEL])
 	require.NotNil(t, context[constants.CTX_VERBOSE])
 	require.NotNil(t, context[constants.CTX_DEBUG_LEVEL])
-	require.NotNil(t, context[constants.CTX_LIBRARY_DISCOVERY_RECURSION_DEPTH])
 
 	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())
@@ -76,7 +75,6 @@ func TestAddAdditionalEntriesToContextWithBuildPath(t *testing.T) {
 	require.NotNil(t, context[constants.CTX_WARNINGS_LEVEL])
 	require.NotNil(t, context[constants.CTX_VERBOSE])
 	require.NotNil(t, context[constants.CTX_DEBUG_LEVEL])
-	require.NotNil(t, context[constants.CTX_LIBRARY_DISCOVERY_RECURSION_DEPTH])
 
 	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())