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

crunch_flags: keep-sorted lines are not descriptions

Browse Source 
Also fix a typo in parsing declare-release-config.

Bug: 328495189
Test: manual, TH
Change-Id: Ibfed4a217275df0dd6bd9c2fb124e0d1f791be08
This commit is contained in:
LaMont Jones
2024-04-19 17:26:27 -07:00
parent 79cd6899c7
commit 11209e1255
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/release_config/crunch_flags/main.go
View File

@@ -89,7 +89,10 @@ func ProcessBuildFlags(dir string, namespaceMap map[string]string) error {
for _, line := range lines { for _, line := range lines {
if comment := commentRegexp.FindStringSubmatch(commentRegexp.FindString(line)); comment != nil { if comment := commentRegexp.FindStringSubmatch(commentRegexp.FindString(line)); comment != nil {
// Description is the text from any contiguous series of lines before a `flag()` call. // Description is the text from any contiguous series of lines before a `flag()` call.
description += fmt.Sprintf(" %s", strings.TrimSpace(comment[commentRegexp.SubexpIndex("comment")])) descLine := strings.TrimSpace(comment[commentRegexp.SubexpIndex("comment")])
if !strings.HasPrefix(descLine, "keep-sorted") {
description += fmt.Sprintf(" %s", descLine)
}
continue continue
} }
matches := declRegexp.FindStringSubmatch(declRegexp.FindString(line)) matches := declRegexp.FindStringSubmatch(declRegexp.FindString(line))
@@ -218,7 +221,7 @@ func ProcessReleaseConfigMap(dir string, descriptionMap map[string]string) error
} else { } else {
fmt.Printf("Processing %s\n", path) fmt.Printf("Processing %s\n", path)
} }
configRegexp, err := regexp.Compile("^..call[[:space:]]+declare-release-config,[[:space:]]+(?<name>[_a-z0-0A-Z]+),[[:space:]]+(?<files>[^,]*)(,[[:space:]]*(?<inherits>.*)|[[:space:]]*)[)]$") configRegexp, err := regexp.Compile("^..call[[:space:]]+declare-release-config,[[:space:]]+(?<name>[_a-z0-9A-Z]+),[[:space:]]+(?<files>[^,]*)(,[[:space:]]*(?<inherits>.*)|[[:space:]]*)[)]$")
if err != nil { if err != nil {
return err return err
} }