mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-20 00:47:28 +01:00
Drop wuffs-c genrelease's exec of the C-formatter
genrelease essentially concatenates the individual packages' generated C files, which should already be formatted. ---- $ # Before. $ time wuffs gen > /dev/null real 0m2.622s user 0m2.457s sys 0m0.266s $ # After. $ time wuffs gen > /dev/null real 0m1.433s user 0m1.335s sys 0m0.191s ----
This commit is contained in:
1 parent
16c1f3cfd7
commit
3efb204f4e
4 files changed
+19
-52
No files matched your search
+1
-1
@@ -110,7 +110,7 @@ func doGenGenlib(wuffsRoot string, args []string, genlib bool) error {
|
||||
if genlib {
|
||||
return h.genlibAffected()
|
||||
}
|
||||
return genrelease(wuffsRoot, langs, v, *cformatterFlag)
|
||||
return genrelease(wuffsRoot, langs, v)
|
||||
}
|
||||
|
||||
type genHelper struct {
|
||||
|
||||
@@ -24,13 +24,13 @@ import (
|
||||
cf "github.com/google/wuffs/cmd/commonflags"
|
||||
)
|
||||
|
||||
func genrelease(wuffsRoot string, langs []string, v cf.Version, cformatter string) error {
|
||||
func genrelease(wuffsRoot string, langs []string, v cf.Version) error {
|
||||
revision := runGitCommand(wuffsRoot, "rev-parse", "HEAD")
|
||||
commitDate := runGitCommand(wuffsRoot, "show",
|
||||
"--quiet", "--date=format-local:%Y-%m-%d", "--format=%cd")
|
||||
gitRevListCount := runGitCommand(wuffsRoot, "rev-list", "--count", "HEAD")
|
||||
for _, lang := range langs {
|
||||
filename, contents, err := genreleaseLang(wuffsRoot, revision, commitDate, gitRevListCount, v, cformatter, lang)
|
||||
filename, contents, err := genreleaseLang(wuffsRoot, revision, commitDate, gitRevListCount, v, lang)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -41,7 +41,7 @@ func genrelease(wuffsRoot string, langs []string, v cf.Version, cformatter strin
|
||||
return nil
|
||||
}
|
||||
|
||||
func genreleaseLang(wuffsRoot string, revision string, commitDate, gitRevListCount string, v cf.Version, cformatter string, lang string) (filename string, contents []byte, err error) {
|
||||
func genreleaseLang(wuffsRoot string, revision string, commitDate, gitRevListCount string, v cf.Version, lang string) (filename string, contents []byte, err error) {
|
||||
qualFilenames, err := findFiles(filepath.Join(wuffsRoot, "gen", lang), "."+lang)
|
||||
if err != nil {
|
||||
return "", nil, err
|
||||
@@ -57,9 +57,6 @@ func genreleaseLang(wuffsRoot string, revision string, commitDate, gitRevListCou
|
||||
if gitRevListCount != "" {
|
||||
args = append(args, "-gitrevlistcount", gitRevListCount)
|
||||
}
|
||||
if lang == "c" {
|
||||
args = append(args, "-cformatter", cformatter)
|
||||
}
|
||||
args = append(args, qualFilenames...)
|
||||
stdout := &bytes.Buffer{}
|
||||
|
||||
|
||||
+1
-1
@@ -116,7 +116,7 @@ func doBenchTest(wuffsRoot string, args []string, bench bool) error {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if err := genrelease(wuffsRoot, langs, cf.Version{}, *cformatterFlag); err != nil {
|
||||
if err := genrelease(wuffsRoot, langs, cf.Version{}); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user