Cache and print also stdout

Author: facchinm

builder_utils/utils.go

@@ -232,19 +232,25 @@ func compileFileWithRecipe(ctx *types.Context, sourcePath string, source string,
 	}
 
 	if !objIsUpToDate {
-		_, stderrCache, err := ExecRecipe(ctx, properties, recipe, false /* stdout */, utils.ShowIfVerbose /* stderr */, utils.Show)
+		stdout, stderr, err := ExecRecipe(ctx, properties, recipe, false /* stdout */, utils.ShowIfVerbose /* stderr */, utils.Show)
 		if err != nil {
 			return "", i18n.WrapError(err)
 		}
 		warningCacheMutex.Lock()
-		ctx.WarningsCache[source] = string(stderrCache)
+		ctx.WarningsCache[source] = types.Streams{
+			Stderr: stderr,
+			Stdout: stdout,
+		}
 		warningCacheMutex.Unlock()
 	} else {
 		if ctx.Verbose {
 			logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_USING_PREVIOUS_COMPILED_FILE, properties[constants.BUILD_PROPERTIES_OBJECT_FILE])
 		}
-		if ctx.WarningsCache[source] != "" {
-			logger.UnformattedFprintln(os.Stderr, ctx.WarningsCache[source])
+		if len(ctx.WarningsCache[source].Stderr) > 0 && ctx.WarningsLevel != "none" {
+			logger.UnformattedWrite(os.Stderr, ctx.WarningsCache[source].Stderr)
+		}
+		if len(ctx.WarningsCache[source].Stdout) > 0 && ctx.WarningsLevel != "none" {
+			logger.UnformattedWrite(os.Stdout, ctx.WarningsCache[source].Stdout)
 		}
 	}
 

load_previous_build_options.go

@@ -67,7 +67,7 @@ type LoadPreviousWarningsMap struct{}
 
 func (s *LoadPreviousWarningsMap) Run(ctx *types.Context) error {
 	cachedWarningsFile := filepath.Join(ctx.BuildPath, constants.FILE_WARNINGS_CACHE)
-	ctx.WarningsCache = make(map[string]string)
+	ctx.WarningsCache = make(map[string]types.Streams)
 
 	_, err := os.Stat(cachedWarningsFile)
 	if err != nil {

types/context.go

@@ -14,6 +14,11 @@ type ProgressStruct struct {
 	Progress     float64
 }
 
+type Streams struct {
+	Stdout []byte
+	Stderr []byte
+}
+
 // Context structure
 type Context struct {
 	// Build options
@@ -65,7 +70,7 @@ type Context struct {
 	CodeCompletions string
 
 	WarningsLevel string
-	WarningsCache map[string]string
+	WarningsCache map[string]Streams
 
 	// Libraries handling
 	Libraries                  []*Library