StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable mk2rbc warnings/errors by default"

Browse Source
This commit is contained in:
Cole Faust
2021-11-10 21:29:26 +00:00
committed by Gerrit Code Review
parent fe700e19c8 17cecd7b17
commit f8ff9cf68c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mk2rbc/cmd/mk2rbc.go
View File

@@ -46,7 +46,7 @@ var (
dryRun = flag.Bool("dry_run", false, "dry run") dryRun = flag.Bool("dry_run", false, "dry run")
recurse = flag.Bool("convert_dependents", false, "convert all dependent files") recurse = flag.Bool("convert_dependents", false, "convert all dependent files")
mode = flag.String("mode", "", `"backup" to back up existing files, "write" to overwrite them`) mode = flag.String("mode", "", `"backup" to back up existing files, "write" to overwrite them`)
warn = flag.Bool("warnings", false, "warn about partially failed conversions") noWarn = flag.Bool("no_warnings", false, "don't warn about partially failed conversions")
verbose = flag.Bool("v", false, "print summary") verbose = flag.Bool("v", false, "print summary")
errstat = flag.Bool("error_stat", false, "print error statistics") errstat = flag.Bool("error_stat", false, "print error statistics")
traceVar = flag.String("trace", "", "comma-separated list of variables to trace") traceVar = flag.String("trace", "", "comma-separated list of variables to trace")
@@ -75,7 +75,7 @@ func init() {
flagAlias("root", "d") flagAlias("root", "d")
flagAlias("dry_run", "n") flagAlias("dry_run", "n")
flagAlias("convert_dependents", "r") flagAlias("convert_dependents", "r")
flagAlias("warnings", "w") flagAlias("no_warnings", "w")
flagAlias("error_stat", "e") flagAlias("error_stat", "e")
} }
@@ -336,7 +336,7 @@ func convertOne(mkFile string) (ok bool) {
OutputSuffix: *suffix, OutputSuffix: *suffix,
TracedVariables: tracedVariables, TracedVariables: tracedVariables,
TraceCalls: *traceCalls, TraceCalls: *traceCalls,
WarnPartialSuccess: *warn, WarnPartialSuccess: !*noWarn,
SourceFS: os.DirFS(*rootDir), SourceFS: os.DirFS(*rootDir),
MakefileFinder: makefileFinder, MakefileFinder: makefileFinder,
} }
@@ -419,7 +419,7 @@ func writeGenerated(path string, contents string) error {
func printStats() { func printStats() {
var sortedFiles []string var sortedFiles []string
if !*warn && !*verbose { if *noWarn && !*verbose {
return return
} }
for p := range converted { for p := range converted {
@@ -437,7 +437,7 @@ func printStats() {
nOk++ nOk++
} }
} }
if *warn { if !*noWarn {
if nPartial > 0 { if nPartial > 0 {
fmt.Fprintf(os.Stderr, "Conversion was partially successful for:\n") fmt.Fprintf(os.Stderr, "Conversion was partially successful for:\n")
for _, f := range sortedFiles { for _, f := range sortedFiles {