Pass debug level and logger to ObjFileIsUpToDate

matthijskooijman · matthijskooijman · commit 4327e72f4da5 · 2017-03-02T13:52:59.000+01:00
This does not change any behaviour, but only passed these variables
along through the entire stack of functions leading up to
ObjFileIsUpToDate. This prepares for the next commit.

Signed-off-by: Matthijs Kooijman &lt;matthijs@stdin.nl&gt;
diff --git a/src/arduino.cc/builder/builder_utils/utils.go b/src/arduino.cc/builder/builder_utils/utils.go
@@ -43,8 +43,8 @@ import (
 	"arduino.cc/properties"
 )
 
-func CompileFilesRecursive(objectFiles []string, sourcePath string, buildPath string, buildProperties properties.Map, includes []string, verbose bool, warningsLevel string, logger i18n.Logger) ([]string, error) {
-	objectFiles, err := CompileFiles(objectFiles, sourcePath, false, buildPath, buildProperties, includes, verbose, warningsLevel, logger)
+func CompileFilesRecursive(objectFiles []string, sourcePath string, buildPath string, buildProperties properties.Map, includes []string, verbose bool, warningsLevel string, debugLevel int, logger i18n.Logger) ([]string, error) {
+	objectFiles, err := CompileFiles(objectFiles, sourcePath, false, buildPath, buildProperties, includes, verbose, warningsLevel, debugLevel, logger)
 	if err != nil {
 		return nil, i18n.WrapError(err)
 	}
@@ -55,7 +55,7 @@ func CompileFilesRecursive(objectFiles []string, sourcePath string, buildPath st
 	}
 
 	for _, folder := range folders {
-		objectFiles, err = CompileFilesRecursive(objectFiles, filepath.Join(sourcePath, folder.Name()), filepath.Join(buildPath, folder.Name()), buildProperties, includes, verbose, warningsLevel, logger)
+		objectFiles, err = CompileFilesRecursive(objectFiles, filepath.Join(sourcePath, folder.Name()), filepath.Join(buildPath, folder.Name()), buildProperties, includes, verbose, warningsLevel, debugLevel, logger)
 		if err != nil {
 			return nil, i18n.WrapError(err)
 		}
@@ -64,28 +64,28 @@ func CompileFilesRecursive(objectFiles []string, sourcePath string, buildPath st
 	return objectFiles, nil
 }
 
-func CompileFiles(objectFiles []string, sourcePath string, recurse bool, buildPath string, buildProperties properties.Map, includes []string, verbose bool, warningsLevel string, logger i18n.Logger) ([]string, error) {
-	objectFiles, err := compileFilesWithExtensionWithRecipe(objectFiles, sourcePath, recurse, buildPath, buildProperties, includes, ".S", constants.RECIPE_S_PATTERN, verbose, warningsLevel, logger)
+func CompileFiles(objectFiles []string, sourcePath string, recurse bool, buildPath string, buildProperties properties.Map, includes []string, verbose bool, warningsLevel string, debugLevel int, logger i18n.Logger) ([]string, error) {
+	objectFiles, err := compileFilesWithExtensionWithRecipe(objectFiles, sourcePath, recurse, buildPath, buildProperties, includes, ".S", constants.RECIPE_S_PATTERN, verbose, warningsLevel, debugLevel, logger)
 	if err != nil {
 		return nil, i18n.WrapError(err)
 	}
-	objectFiles, err = compileFilesWithExtensionWithRecipe(objectFiles, sourcePath, recurse, buildPath, buildProperties, includes, ".c", constants.RECIPE_C_PATTERN, verbose, warningsLevel, logger)
+	objectFiles, err = compileFilesWithExtensionWithRecipe(objectFiles, sourcePath, recurse, buildPath, buildProperties, includes, ".c", constants.RECIPE_C_PATTERN, verbose, warningsLevel, debugLevel, logger)
 	if err != nil {
 		return nil, i18n.WrapError(err)
 	}
-	objectFiles, err = compileFilesWithExtensionWithRecipe(objectFiles, sourcePath, recurse, buildPath, buildProperties, includes, ".cpp", constants.RECIPE_CPP_PATTERN, verbose, warningsLevel, logger)
+	objectFiles, err = compileFilesWithExtensionWithRecipe(objectFiles, sourcePath, recurse, buildPath, buildProperties, includes, ".cpp", constants.RECIPE_CPP_PATTERN, verbose, warningsLevel, debugLevel, logger)
 	if err != nil {
 		return nil, i18n.WrapError(err)
 	}
 	return objectFiles, nil
 }
 
-func compileFilesWithExtensionWithRecipe(objectFiles []string, sourcePath string, recurse bool, buildPath string, buildProperties properties.Map, includes []string, extension string, recipe string, verbose bool, warningsLevel string, logger i18n.Logger) ([]string, error) {
+func compileFilesWithExtensionWithRecipe(objectFiles []string, sourcePath string, recurse bool, buildPath string, buildProperties properties.Map, includes []string, extension string, recipe string, verbose bool, warningsLevel string, debugLevel int, logger i18n.Logger) ([]string, error) {
 	sources, err := findFilesInFolder(sourcePath, extension, recurse)
 	if err != nil {
 		return nil, i18n.WrapError(err)
 	}
-	return compileFilesWithRecipe(objectFiles, sourcePath, sources, buildPath, buildProperties, includes, recipe, verbose, warningsLevel, logger)
+	return compileFilesWithRecipe(objectFiles, sourcePath, sources, buildPath, buildProperties, includes, recipe, verbose, warningsLevel, debugLevel, logger)
 }
 
 func findFilesInFolder(sourcePath string, extension string, recurse bool) ([]string, error) {
@@ -116,9 +116,9 @@ func findFilesInFolder(sourcePath string, extension string, recurse bool) ([]str
 	return sources, nil
 }
 
-func compileFilesWithRecipe(objectFiles []string, sourcePath string, sources []string, buildPath string, buildProperties properties.Map, includes []string, recipe string, verbose bool, warningsLevel string, logger i18n.Logger) ([]string, error) {
+func compileFilesWithRecipe(objectFiles []string, sourcePath string, sources []string, buildPath string, buildProperties properties.Map, includes []string, recipe string, verbose bool, warningsLevel string, debugLevel int, logger i18n.Logger) ([]string, error) {
 	for _, source := range sources {
-		objectFile, err := compileFileWithRecipe(sourcePath, source, buildPath, buildProperties, includes, recipe, verbose, warningsLevel, logger)
+		objectFile, err := compileFileWithRecipe(sourcePath, source, buildPath, buildProperties, includes, recipe, verbose, warningsLevel, debugLevel, logger)
 		if err != nil {
 			return nil, i18n.WrapError(err)
 		}
@@ -128,7 +128,7 @@ func compileFilesWithRecipe(objectFiles []string, sourcePath string, sources []s
 	return objectFiles, nil
 }
 
-func compileFileWithRecipe(sourcePath string, source string, buildPath string, buildProperties properties.Map, includes []string, recipe string, verbose bool, warningsLevel string, logger i18n.Logger) (string, error) {
+func compileFileWithRecipe(sourcePath string, source string, buildPath string, buildProperties properties.Map, includes []string, recipe string, verbose bool, warningsLevel string, debugLevel int, logger i18n.Logger) (string, error) {
 	properties := buildProperties.Clone()
 	properties[constants.BUILD_PROPERTIES_COMPILER_WARNING_FLAGS] = properties[constants.BUILD_PROPERTIES_COMPILER_WARNING_FLAGS+"."+warningsLevel]
 	properties[constants.BUILD_PROPERTIES_INCLUDES] = strings.Join(includes, constants.SPACE)
@@ -144,7 +144,7 @@ func compileFileWithRecipe(sourcePath string, source string, buildPath string, b
 		return "", i18n.WrapError(err)
 	}
 
-	objIsUpToDate, err := ObjFileIsUpToDate(properties[constants.BUILD_PROPERTIES_SOURCE_FILE], properties[constants.BUILD_PROPERTIES_OBJECT_FILE], filepath.Join(buildPath, relativeSource+".d"))
+	objIsUpToDate, err := ObjFileIsUpToDate(properties[constants.BUILD_PROPERTIES_SOURCE_FILE], properties[constants.BUILD_PROPERTIES_OBJECT_FILE], filepath.Join(buildPath, relativeSource+".d"), debugLevel, logger)
 	if err != nil {
 		return "", i18n.WrapError(err)
 	}
@@ -161,7 +161,7 @@ func compileFileWithRecipe(sourcePath string, source string, buildPath string, b
 	return properties[constants.BUILD_PROPERTIES_OBJECT_FILE], nil
 }
 
-func ObjFileIsUpToDate(sourceFile, objectFile, dependencyFile string) (bool, error) {
+func ObjFileIsUpToDate(sourceFile, objectFile, dependencyFile string, debugLevel int, logger i18n.Logger) (bool, error) {
 	sourceFile = filepath.Clean(sourceFile)
 	objectFile = filepath.Clean(objectFile)
 	dependencyFile = filepath.Clean(dependencyFile)
diff --git a/src/arduino.cc/builder/container_find_includes.go b/src/arduino.cc/builder/container_find_includes.go
@@ -303,7 +303,7 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile t
 	// TODO: This reads the dependency file, but the actual building
 	// does it again. Should the result be somehow cached? Perhaps
 	// remove the object file if it is found to be stale?
-	unchanged, err := builder_utils.ObjFileIsUpToDate(sourcePath, sourceFile.ObjectPath(ctx), sourceFile.DepfilePath(ctx))
+	unchanged, err := builder_utils.ObjFileIsUpToDate(sourcePath, sourceFile.ObjectPath(ctx), sourceFile.DepfilePath(ctx), ctx.DebugLevel, ctx.GetLogger())
 	if err != nil {
 		return i18n.WrapError(err)
 	}
diff --git a/src/arduino.cc/builder/phases/core_builder.go b/src/arduino.cc/builder/phases/core_builder.go
@@ -52,7 +52,7 @@ func (s *CoreBuilder) Run(ctx *types.Context) error {
 		return i18n.WrapError(err)
 	}
 
-	archiveFile, objectFiles, err := compileCore(coreBuildPath, buildProperties, verbose, warningsLevel, logger)
+	archiveFile, objectFiles, err := compileCore(coreBuildPath, buildProperties, verbose, warningsLevel, ctx.DebugLevel, logger)
 	if err != nil {
 		return i18n.WrapError(err)
 	}
@@ -63,7 +63,7 @@ func (s *CoreBuilder) Run(ctx *types.Context) error {
 	return nil
 }
 
-func compileCore(buildPath string, buildProperties properties.Map, verbose bool, warningsLevel string, logger i18n.Logger) (string, []string, error) {
+func compileCore(buildPath string, buildProperties properties.Map, verbose bool, warningsLevel string, debugLevel int, logger i18n.Logger) (string, []string, error) {
 	coreFolder := buildProperties[constants.BUILD_PROPERTIES_BUILD_CORE_PATH]
 	variantFolder := buildProperties[constants.BUILD_PROPERTIES_BUILD_VARIANT_PATH]
 
@@ -78,13 +78,13 @@ func compileCore(buildPath string, buildProperties properties.Map, verbose bool,
 
 	variantObjectFiles := []string{}
 	if variantFolder != constants.EMPTY_STRING {
-		variantObjectFiles, err = builder_utils.CompileFiles(variantObjectFiles, variantFolder, true, buildPath, buildProperties, includes, verbose, warningsLevel, logger)
+		variantObjectFiles, err = builder_utils.CompileFiles(variantObjectFiles, variantFolder, true, buildPath, buildProperties, includes, verbose, warningsLevel, debugLevel, logger)
 		if err != nil {
 			return "", nil, i18n.WrapError(err)
 		}
 	}
 
-	coreObjectFiles, err := builder_utils.CompileFiles([]string{}, coreFolder, true, buildPath, buildProperties, includes, verbose, warningsLevel, logger)
+	coreObjectFiles, err := builder_utils.CompileFiles([]string{}, coreFolder, true, buildPath, buildProperties, includes, verbose, warningsLevel, debugLevel, logger)
 	if err != nil {
 		return "", nil, i18n.WrapError(err)
 	}
diff --git a/src/arduino.cc/builder/phases/libraries_builder.go b/src/arduino.cc/builder/phases/libraries_builder.go
@@ -50,14 +50,15 @@ func (s *LibrariesBuilder) Run(ctx *types.Context) error {
 	libraries := ctx.ImportedLibraries
 	verbose := ctx.Verbose
 	warningsLevel := ctx.WarningsLevel
+	debugLevel := ctx.DebugLevel
 	logger := ctx.GetLogger()
 
 	err := utils.EnsureFolderExists(librariesBuildPath)
 	if err != nil {
 		return i18n.WrapError(err)
 	}
 
-	objectFiles, err := compileLibraries(libraries, librariesBuildPath, buildProperties, includes, verbose, warningsLevel, logger)
+	objectFiles, err := compileLibraries(libraries, librariesBuildPath, buildProperties, includes, verbose, warningsLevel, debugLevel, logger)
 	if err != nil {
 		return i18n.WrapError(err)
 	}
@@ -67,10 +68,10 @@ func (s *LibrariesBuilder) Run(ctx *types.Context) error {
 	return nil
 }
 
-func compileLibraries(libraries []*types.Library, buildPath string, buildProperties properties.Map, includes []string, verbose bool, warningsLevel string, logger i18n.Logger) ([]string, error) {
+func compileLibraries(libraries []*types.Library, buildPath string, buildProperties properties.Map, includes []string, verbose bool, warningsLevel string, debugLevel int, logger i18n.Logger) ([]string, error) {
 	objectFiles := []string{}
 	for _, library := range libraries {
-		libraryObjectFiles, err := compileLibrary(library, buildPath, buildProperties, includes, verbose, warningsLevel, logger)
+		libraryObjectFiles, err := compileLibrary(library, buildPath, buildProperties, includes, verbose, warningsLevel, debugLevel, logger)
 		if err != nil {
 			return nil, i18n.WrapError(err)
 		}
@@ -81,7 +82,7 @@ func compileLibraries(libraries []*types.Library, buildPath string, buildPropert
 
 }
 
-func compileLibrary(library *types.Library, buildPath string, buildProperties properties.Map, includes []string, verbose bool, warningsLevel string, logger i18n.Logger) ([]string, error) {
+func compileLibrary(library *types.Library, buildPath string, buildProperties properties.Map, includes []string, verbose bool, warningsLevel string, debugLevel int, logger i18n.Logger) ([]string, error) {
 	if verbose {
 		logger.Println(constants.LOG_LEVEL_INFO, "Compiling library \"{0}\"", library.Name)
 	}
@@ -94,7 +95,7 @@ func compileLibrary(library *types.Library, buildPath string, buildProperties pr
 
 	objectFiles := []string{}
 	if library.Layout == types.LIBRARY_RECURSIVE {
-		objectFiles, err = builder_utils.CompileFilesRecursive(objectFiles, library.SrcFolder, libraryBuildPath, buildProperties, includes, verbose, warningsLevel, logger)
+		objectFiles, err = builder_utils.CompileFilesRecursive(objectFiles, library.SrcFolder, libraryBuildPath, buildProperties, includes, verbose, warningsLevel, debugLevel, logger)
 		if err != nil {
 			return nil, i18n.WrapError(err)
 		}
@@ -109,14 +110,14 @@ func compileLibrary(library *types.Library, buildPath string, buildProperties pr
 		if library.UtilityFolder != "" {
 			includes = append(includes, utils.WrapWithHyphenI(library.UtilityFolder))
 		}
-		objectFiles, err = builder_utils.CompileFiles(objectFiles, library.SrcFolder, false, libraryBuildPath, buildProperties, includes, verbose, warningsLevel, logger)
+		objectFiles, err = builder_utils.CompileFiles(objectFiles, library.SrcFolder, false, libraryBuildPath, buildProperties, includes, verbose, warningsLevel, debugLevel, logger)
 		if err != nil {
 			return nil, i18n.WrapError(err)
 		}
 
 		if library.UtilityFolder != "" {
 			utilityBuildPath := filepath.Join(libraryBuildPath, constants.LIBRARY_FOLDER_UTILITY)
-			objectFiles, err = builder_utils.CompileFiles(objectFiles, library.UtilityFolder, false, utilityBuildPath, buildProperties, includes, verbose, warningsLevel, logger)
+			objectFiles, err = builder_utils.CompileFiles(objectFiles, library.UtilityFolder, false, utilityBuildPath, buildProperties, includes, verbose, warningsLevel, debugLevel, logger)
 			if err != nil {
 				return nil, i18n.WrapError(err)
 			}
diff --git a/src/arduino.cc/builder/phases/sketch_builder.go b/src/arduino.cc/builder/phases/sketch_builder.go
@@ -48,6 +48,7 @@ func (s *SketchBuilder) Run(ctx *types.Context) error {
 	includes = utils.Map(includes, utils.WrapWithHyphenI)
 	verbose := ctx.Verbose
 	warningsLevel := ctx.WarningsLevel
+	debugLevel := ctx.DebugLevel
 	logger := ctx.GetLogger()
 
 	err := utils.EnsureFolderExists(sketchBuildPath)
@@ -56,15 +57,15 @@ func (s *SketchBuilder) Run(ctx *types.Context) error {
 	}
 
 	var objectFiles []string
-	objectFiles, err = builder_utils.CompileFiles(objectFiles, sketchBuildPath, false, sketchBuildPath, buildProperties, includes, verbose, warningsLevel, logger)
+	objectFiles, err = builder_utils.CompileFiles(objectFiles, sketchBuildPath, false, sketchBuildPath, buildProperties, includes, verbose, warningsLevel, debugLevel, logger)
 	if err != nil {
 		return i18n.WrapError(err)
 	}
 
 	// The "src/" subdirectory of a sketch is compiled recursively
 	sketchSrcPath := filepath.Join(sketchBuildPath, constants.SKETCH_FOLDER_SRC)
 	if info, err := os.Stat(sketchSrcPath); err == nil && info.IsDir() {
-		objectFiles, err = builder_utils.CompileFiles(objectFiles, sketchSrcPath, true, sketchSrcPath, buildProperties, includes, verbose, warningsLevel, logger)
+		objectFiles, err = builder_utils.CompileFiles(objectFiles, sketchSrcPath, true, sketchSrcPath, buildProperties, includes, verbose, warningsLevel, debugLevel, logger)
 		if err != nil {
 			return i18n.WrapError(err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ import (`
`43`	`43`	`"arduino.cc/properties"`
`44`	`44`	`)`
`45`	`45`
`46`		`-func CompileFilesRecursive(objectFiles []string, sourcePath string, buildPath string, buildProperties properties.Map, includes []string, verbose bool, warningsLevel string, logger i18n.Logger) ([]string, error) {`
`47`		`- objectFiles, err := CompileFiles(objectFiles, sourcePath, false, buildPath, buildProperties, includes, verbose, warningsLevel, logger)`
	`46`	`+func CompileFilesRecursive(objectFiles []string, sourcePath string, buildPath string, buildProperties properties.Map, includes []string, verbose bool, warningsLevel string, debugLevel int, logger i18n.Logger) ([]string, error) {`
	`47`	`+ objectFiles, err := CompileFiles(objectFiles, sourcePath, false, buildPath, buildProperties, includes, verbose, warningsLevel, debugLevel, logger)`
`48`	`48`	`if err != nil {`
`49`	`49`	`return nil, i18n.WrapError(err)`
`50`	`50`	`}`
`@@ -55,7 +55,7 @@ func CompileFilesRecursive(objectFiles []string, sourcePath string, buildPath st`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`for _, folder := range folders {`
`58`		`- objectFiles, err = CompileFilesRecursive(objectFiles, filepath.Join(sourcePath, folder.Name()), filepath.Join(buildPath, folder.Name()), buildProperties, includes, verbose, warningsLevel, logger)`
	`58`	`+ objectFiles, err = CompileFilesRecursive(objectFiles, filepath.Join(sourcePath, folder.Name()), filepath.Join(buildPath, folder.Name()), buildProperties, includes, verbose, warningsLevel, debugLevel, logger)`
`59`	`59`	`if err != nil {`
`60`	`60`	`return nil, i18n.WrapError(err)`
`61`	`61`	`}`
`@@ -64,28 +64,28 @@ func CompileFilesRecursive(objectFiles []string, sourcePath string, buildPath st`
`64`	`64`	`return objectFiles, nil`
`65`	`65`	`}`
`66`	`66`
`67`		`-func CompileFiles(objectFiles []string, sourcePath string, recurse bool, buildPath string, buildProperties properties.Map, includes []string, verbose bool, warningsLevel string, logger i18n.Logger) ([]string, error) {`
`68`		`- objectFiles, err := compileFilesWithExtensionWithRecipe(objectFiles, sourcePath, recurse, buildPath, buildProperties, includes, ".S", constants.RECIPE_S_PATTERN, verbose, warningsLevel, logger)`
	`67`	`+func CompileFiles(objectFiles []string, sourcePath string, recurse bool, buildPath string, buildProperties properties.Map, includes []string, verbose bool, warningsLevel string, debugLevel int, logger i18n.Logger) ([]string, error) {`
	`68`	`+ objectFiles, err := compileFilesWithExtensionWithRecipe(objectFiles, sourcePath, recurse, buildPath, buildProperties, includes, ".S", constants.RECIPE_S_PATTERN, verbose, warningsLevel, debugLevel, logger)`
`69`	`69`	`if err != nil {`
`70`	`70`	`return nil, i18n.WrapError(err)`
`71`	`71`	`}`
`72`		`- objectFiles, err = compileFilesWithExtensionWithRecipe(objectFiles, sourcePath, recurse, buildPath, buildProperties, includes, ".c", constants.RECIPE_C_PATTERN, verbose, warningsLevel, logger)`
	`72`	`+ objectFiles, err = compileFilesWithExtensionWithRecipe(objectFiles, sourcePath, recurse, buildPath, buildProperties, includes, ".c", constants.RECIPE_C_PATTERN, verbose, warningsLevel, debugLevel, logger)`
`73`	`73`	`if err != nil {`
`74`	`74`	`return nil, i18n.WrapError(err)`
`75`	`75`	`}`
`76`		`- objectFiles, err = compileFilesWithExtensionWithRecipe(objectFiles, sourcePath, recurse, buildPath, buildProperties, includes, ".cpp", constants.RECIPE_CPP_PATTERN, verbose, warningsLevel, logger)`
	`76`	`+ objectFiles, err = compileFilesWithExtensionWithRecipe(objectFiles, sourcePath, recurse, buildPath, buildProperties, includes, ".cpp", constants.RECIPE_CPP_PATTERN, verbose, warningsLevel, debugLevel, logger)`
`77`	`77`	`if err != nil {`
`78`	`78`	`return nil, i18n.WrapError(err)`
`79`	`79`	`}`
`80`	`80`	`return objectFiles, nil`
`81`	`81`	`}`
`82`	`82`
`83`		`-func compileFilesWithExtensionWithRecipe(objectFiles []string, sourcePath string, recurse bool, buildPath string, buildProperties properties.Map, includes []string, extension string, recipe string, verbose bool, warningsLevel string, logger i18n.Logger) ([]string, error) {`
	`83`	`+func compileFilesWithExtensionWithRecipe(objectFiles []string, sourcePath string, recurse bool, buildPath string, buildProperties properties.Map, includes []string, extension string, recipe string, verbose bool, warningsLevel string, debugLevel int, logger i18n.Logger) ([]string, error) {`
`84`	`84`	`sources, err := findFilesInFolder(sourcePath, extension, recurse)`
`85`	`85`	`if err != nil {`
`86`	`86`	`return nil, i18n.WrapError(err)`
`87`	`87`	`}`
`88`		`- return compileFilesWithRecipe(objectFiles, sourcePath, sources, buildPath, buildProperties, includes, recipe, verbose, warningsLevel, logger)`
	`88`	`+ return compileFilesWithRecipe(objectFiles, sourcePath, sources, buildPath, buildProperties, includes, recipe, verbose, warningsLevel, debugLevel, logger)`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`func findFilesInFolder(sourcePath string, extension string, recurse bool) ([]string, error) {`
`@@ -116,9 +116,9 @@ func findFilesInFolder(sourcePath string, extension string, recurse bool) ([]str`
`116`	`116`	`return sources, nil`
`117`	`117`	`}`
`118`	`118`
`119`		`-func compileFilesWithRecipe(objectFiles []string, sourcePath string, sources []string, buildPath string, buildProperties properties.Map, includes []string, recipe string, verbose bool, warningsLevel string, logger i18n.Logger) ([]string, error) {`
	`119`	`+func compileFilesWithRecipe(objectFiles []string, sourcePath string, sources []string, buildPath string, buildProperties properties.Map, includes []string, recipe string, verbose bool, warningsLevel string, debugLevel int, logger i18n.Logger) ([]string, error) {`
`120`	`120`	`for _, source := range sources {`
`121`		`- objectFile, err := compileFileWithRecipe(sourcePath, source, buildPath, buildProperties, includes, recipe, verbose, warningsLevel, logger)`
	`121`	`+ objectFile, err := compileFileWithRecipe(sourcePath, source, buildPath, buildProperties, includes, recipe, verbose, warningsLevel, debugLevel, logger)`
`122`	`122`	`if err != nil {`
`123`	`123`	`return nil, i18n.WrapError(err)`
`124`	`124`	`}`
`@@ -128,7 +128,7 @@ func compileFilesWithRecipe(objectFiles []string, sourcePath string, sources []s`
`128`	`128`	`return objectFiles, nil`
`129`	`129`	`}`
`130`	`130`
`131`		`-func compileFileWithRecipe(sourcePath string, source string, buildPath string, buildProperties properties.Map, includes []string, recipe string, verbose bool, warningsLevel string, logger i18n.Logger) (string, error) {`
	`131`	`+func compileFileWithRecipe(sourcePath string, source string, buildPath string, buildProperties properties.Map, includes []string, recipe string, verbose bool, warningsLevel string, debugLevel int, logger i18n.Logger) (string, error) {`
`132`	`132`	`properties := buildProperties.Clone()`
`133`	`133`	`properties[constants.BUILD_PROPERTIES_COMPILER_WARNING_FLAGS] = properties[constants.BUILD_PROPERTIES_COMPILER_WARNING_FLAGS+"."+warningsLevel]`
`134`	`134`	`properties[constants.BUILD_PROPERTIES_INCLUDES] = strings.Join(includes, constants.SPACE)`
`@@ -144,7 +144,7 @@ func compileFileWithRecipe(sourcePath string, source string, buildPath string, b`
`144`	`144`	`return "", i18n.WrapError(err)`
`145`	`145`	`}`
`146`	`146`
`147`		`- objIsUpToDate, err := ObjFileIsUpToDate(properties[constants.BUILD_PROPERTIES_SOURCE_FILE], properties[constants.BUILD_PROPERTIES_OBJECT_FILE], filepath.Join(buildPath, relativeSource+".d"))`
	`147`	`+ objIsUpToDate, err := ObjFileIsUpToDate(properties[constants.BUILD_PROPERTIES_SOURCE_FILE], properties[constants.BUILD_PROPERTIES_OBJECT_FILE], filepath.Join(buildPath, relativeSource+".d"), debugLevel, logger)`
`148`	`148`	`if err != nil {`
`149`	`149`	`return "", i18n.WrapError(err)`
`150`	`150`	`}`
`@@ -161,7 +161,7 @@ func compileFileWithRecipe(sourcePath string, source string, buildPath string, b`
`161`	`161`	`return properties[constants.BUILD_PROPERTIES_OBJECT_FILE], nil`
`162`	`162`	`}`
`163`	`163`
`164`		`-func ObjFileIsUpToDate(sourceFile, objectFile, dependencyFile string) (bool, error) {`
	`164`	`+func ObjFileIsUpToDate(sourceFile, objectFile, dependencyFile string, debugLevel int, logger i18n.Logger) (bool, error) {`
`165`	`165`	`sourceFile = filepath.Clean(sourceFile)`
`166`	`166`	`objectFile = filepath.Clean(objectFile)`
`167`	`167`	`dependencyFile = filepath.Clean(dependencyFile)`
Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ func findIncludesUntilDone(ctx types.Context, cache includeCache, sourceFile t`
`303`	`303`	`// TODO: This reads the dependency file, but the actual building`
`304`	`304`	`// does it again. Should the result be somehow cached? Perhaps`
`305`	`305`	`// remove the object file if it is found to be stale?`
`306`		`- unchanged, err := builder_utils.ObjFileIsUpToDate(sourcePath, sourceFile.ObjectPath(ctx), sourceFile.DepfilePath(ctx))`
	`306`	`+ unchanged, err := builder_utils.ObjFileIsUpToDate(sourcePath, sourceFile.ObjectPath(ctx), sourceFile.DepfilePath(ctx), ctx.DebugLevel, ctx.GetLogger())`
`307`	`307`	`if err != nil {`
`308`	`308`	`return i18n.WrapError(err)`
`309`	`309`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func (s CoreBuilder) Run(ctx types.Context) error {`
`52`	`52`	`return i18n.WrapError(err)`
`53`	`53`	`}`
`54`	`54`
`55`		`- archiveFile, objectFiles, err := compileCore(coreBuildPath, buildProperties, verbose, warningsLevel, logger)`
	`55`	`+ archiveFile, objectFiles, err := compileCore(coreBuildPath, buildProperties, verbose, warningsLevel, ctx.DebugLevel, logger)`
`56`	`56`	`if err != nil {`
`57`	`57`	`return i18n.WrapError(err)`
`58`	`58`	`}`
`@@ -63,7 +63,7 @@ func (s CoreBuilder) Run(ctx types.Context) error {`
`63`	`63`	`return nil`
`64`	`64`	`}`
`65`	`65`
`66`		`-func compileCore(buildPath string, buildProperties properties.Map, verbose bool, warningsLevel string, logger i18n.Logger) (string, []string, error) {`
	`66`	`+func compileCore(buildPath string, buildProperties properties.Map, verbose bool, warningsLevel string, debugLevel int, logger i18n.Logger) (string, []string, error) {`
`67`	`67`	`coreFolder := buildProperties[constants.BUILD_PROPERTIES_BUILD_CORE_PATH]`
`68`	`68`	`variantFolder := buildProperties[constants.BUILD_PROPERTIES_BUILD_VARIANT_PATH]`
`69`	`69`
`@@ -78,13 +78,13 @@ func compileCore(buildPath string, buildProperties properties.Map, verbose bool,`
`78`	`78`
`79`	`79`	`variantObjectFiles := []string{}`
`80`	`80`	`if variantFolder != constants.EMPTY_STRING {`
`81`		`- variantObjectFiles, err = builder_utils.CompileFiles(variantObjectFiles, variantFolder, true, buildPath, buildProperties, includes, verbose, warningsLevel, logger)`
	`81`	`+ variantObjectFiles, err = builder_utils.CompileFiles(variantObjectFiles, variantFolder, true, buildPath, buildProperties, includes, verbose, warningsLevel, debugLevel, logger)`
`82`	`82`	`if err != nil {`
`83`	`83`	`return "", nil, i18n.WrapError(err)`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`87`		`- coreObjectFiles, err := builder_utils.CompileFiles([]string{}, coreFolder, true, buildPath, buildProperties, includes, verbose, warningsLevel, logger)`
	`87`	`+ coreObjectFiles, err := builder_utils.CompileFiles([]string{}, coreFolder, true, buildPath, buildProperties, includes, verbose, warningsLevel, debugLevel, logger)`
`88`	`88`	`if err != nil {`
`89`	`89`	`return "", nil, i18n.WrapError(err)`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,14 +50,15 @@ func (s LibrariesBuilder) Run(ctx types.Context) error {`
`50`	`50`	`libraries := ctx.ImportedLibraries`
`51`	`51`	`verbose := ctx.Verbose`
`52`	`52`	`warningsLevel := ctx.WarningsLevel`
	`53`	`+ debugLevel := ctx.DebugLevel`
`53`	`54`	`logger := ctx.GetLogger()`
`54`	`55`
`55`	`56`	`err := utils.EnsureFolderExists(librariesBuildPath)`
`56`	`57`	`if err != nil {`
`57`	`58`	`return i18n.WrapError(err)`
`58`	`59`	`}`
`59`	`60`
`60`		`- objectFiles, err := compileLibraries(libraries, librariesBuildPath, buildProperties, includes, verbose, warningsLevel, logger)`
	`61`	`+ objectFiles, err := compileLibraries(libraries, librariesBuildPath, buildProperties, includes, verbose, warningsLevel, debugLevel, logger)`
`61`	`62`	`if err != nil {`
`62`	`63`	`return i18n.WrapError(err)`
`63`	`64`	`}`
`@@ -67,10 +68,10 @@ func (s LibrariesBuilder) Run(ctx types.Context) error {`
`67`	`68`	`return nil`
`68`	`69`	`}`
`69`	`70`
`70`		`-func compileLibraries(libraries []*types.Library, buildPath string, buildProperties properties.Map, includes []string, verbose bool, warningsLevel string, logger i18n.Logger) ([]string, error) {`
	`71`	`+func compileLibraries(libraries []*types.Library, buildPath string, buildProperties properties.Map, includes []string, verbose bool, warningsLevel string, debugLevel int, logger i18n.Logger) ([]string, error) {`
`71`	`72`	`objectFiles := []string{}`
`72`	`73`	`for _, library := range libraries {`
`73`		`- libraryObjectFiles, err := compileLibrary(library, buildPath, buildProperties, includes, verbose, warningsLevel, logger)`
	`74`	`+ libraryObjectFiles, err := compileLibrary(library, buildPath, buildProperties, includes, verbose, warningsLevel, debugLevel, logger)`
`74`	`75`	`if err != nil {`
`75`	`76`	`return nil, i18n.WrapError(err)`
`76`	`77`	`}`
`@@ -81,7 +82,7 @@ func compileLibraries(libraries []*types.Library, buildPath string, buildPropert`
`81`	`82`
`82`	`83`	`}`
`83`	`84`
`84`		`-func compileLibrary(library *types.Library, buildPath string, buildProperties properties.Map, includes []string, verbose bool, warningsLevel string, logger i18n.Logger) ([]string, error) {`
	`85`	`+func compileLibrary(library *types.Library, buildPath string, buildProperties properties.Map, includes []string, verbose bool, warningsLevel string, debugLevel int, logger i18n.Logger) ([]string, error) {`
`85`	`86`	`if verbose {`
`86`	`87`	`logger.Println(constants.LOG_LEVEL_INFO, "Compiling library \"{0}\"", library.Name)`
`87`	`88`	`}`
`@@ -94,7 +95,7 @@ func compileLibrary(library *types.Library, buildPath string, buildProperties pr`
`94`	`95`
`95`	`96`	`objectFiles := []string{}`
`96`	`97`	`if library.Layout == types.LIBRARY_RECURSIVE {`
`97`		`- objectFiles, err = builder_utils.CompileFilesRecursive(objectFiles, library.SrcFolder, libraryBuildPath, buildProperties, includes, verbose, warningsLevel, logger)`
	`98`	`+ objectFiles, err = builder_utils.CompileFilesRecursive(objectFiles, library.SrcFolder, libraryBuildPath, buildProperties, includes, verbose, warningsLevel, debugLevel, logger)`
`98`	`99`	`if err != nil {`
`99`	`100`	`return nil, i18n.WrapError(err)`
`100`	`101`	`}`
`@@ -109,14 +110,14 @@ func compileLibrary(library *types.Library, buildPath string, buildProperties pr`
`109`	`110`	`if library.UtilityFolder != "" {`
`110`	`111`	`includes = append(includes, utils.WrapWithHyphenI(library.UtilityFolder))`
`111`	`112`	`}`
`112`		`- objectFiles, err = builder_utils.CompileFiles(objectFiles, library.SrcFolder, false, libraryBuildPath, buildProperties, includes, verbose, warningsLevel, logger)`
	`113`	`+ objectFiles, err = builder_utils.CompileFiles(objectFiles, library.SrcFolder, false, libraryBuildPath, buildProperties, includes, verbose, warningsLevel, debugLevel, logger)`
`113`	`114`	`if err != nil {`
`114`	`115`	`return nil, i18n.WrapError(err)`
`115`	`116`	`}`
`116`	`117`
`117`	`118`	`if library.UtilityFolder != "" {`
`118`	`119`	`utilityBuildPath := filepath.Join(libraryBuildPath, constants.LIBRARY_FOLDER_UTILITY)`
`119`		`- objectFiles, err = builder_utils.CompileFiles(objectFiles, library.UtilityFolder, false, utilityBuildPath, buildProperties, includes, verbose, warningsLevel, logger)`
	`120`	`+ objectFiles, err = builder_utils.CompileFiles(objectFiles, library.UtilityFolder, false, utilityBuildPath, buildProperties, includes, verbose, warningsLevel, debugLevel, logger)`
`120`	`121`	`if err != nil {`
`121`	`122`	`return nil, i18n.WrapError(err)`
`122`	`123`	`}`