[cbuild] Reduce default verbosity when using cbuild2cmake mode

Open-CMSIS-Pack · Jun 14, 2024 · ac1cea2 · ac1cea2
1 parent d74fe33
commit ac1cea2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/pkg/builder/cbuildidx/builder.go b/pkg/builder/cbuildidx/builder.go
@@ -162,7 +162,7 @@ func (b CbuildIdxBuilder) Build() error {
 		log.Debug("cbuild2cmake command: " + vars.Cbuild2cmakeBin + " " + strings.Join(args, " "))
 	}
 
-	_, err = b.Runner.ExecuteCommand(vars.Cbuild2cmakeBin, false, args...)
+	_, err = b.Runner.ExecuteCommand(vars.Cbuild2cmakeBin, !(b.Options.Debug || b.Options.Verbose), args...)
 	if err != nil {
 		return err
 	}
@@ -194,7 +194,7 @@ func (b CbuildIdxBuilder) Build() error {
 		log.Debug("cmake configuration command: " + vars.CmakeBin + " " + strings.Join(args, " "))
 	}
 
-	_, err = b.Runner.ExecuteCommand(vars.CmakeBin, b.Options.Quiet, args...)
+	_, err = b.Runner.ExecuteCommand(vars.CmakeBin, !(b.Options.Debug || b.Options.Verbose), args...)
 	if err != nil {
 		return err
 	}
@@ -212,6 +212,10 @@ func (b CbuildIdxBuilder) Build() error {
 		args = append(args, "--target", b.BuildContext+"-database")
 	}
 
+	if b.Options.Generator == "Ninja" && !(b.Options.Debug || b.Options.Verbose) {
+		args = append(args, "--", "--quiet")
+	}
+
 	if b.Options.Debug {
 		log.Debug("cmake build command: " + vars.CmakeBin + " " + strings.Join(args, " "))
 	}

diff --git a/pkg/builder/csolution/builder.go b/pkg/builder/csolution/builder.go
@@ -198,7 +198,7 @@ func (b CSolutionBuilder) generateBuildFiles() (err error) {
 		args = append(args, "--quiet")
 	}
 
-	_, err = b.runCSolution(args, false)
+	_, err = b.runCSolution(args, !(b.Options.Debug || b.Options.Verbose))
 
 	// Execute this code exclusively upon invocation of the 'setup' command.
 	// Its purpose is to update layer information within the *.cbuild-idx.yml files.