diff --git a/cmd/wuffs-c/release.go b/cmd/wuffs-c/release.go index 1b435c61..382d359a 100644 --- a/cmd/wuffs-c/release.go +++ b/cmd/wuffs-c/release.go @@ -137,6 +137,11 @@ func doGenrelease(args []string) error { now = time.Now() } + if *cformatterFlag == "" { + os.Stdout.Write(unformatted.Bytes()) + return nil + } + cmd := exec.Command(*cformatterFlag, "-style=Chromium") cmd.Stdin = unformatted cmd.Stdout = os.Stdout diff --git a/cmd/wuffs/gen.go b/cmd/wuffs/gen.go index 5bb16190..61133e6e 100644 --- a/cmd/wuffs/gen.go +++ b/cmd/wuffs/gen.go @@ -110,7 +110,7 @@ func doGenGenlib(wuffsRoot string, args []string, genlib bool) error { if genlib { return h.genlibAffected() } - return genrelease(wuffsRoot, langs, v) + return genrelease(wuffsRoot, langs, v, *cformatterFlag) } type genHelper struct { diff --git a/cmd/wuffs/release.go b/cmd/wuffs/release.go index ada21ac9..902555b1 100644 --- a/cmd/wuffs/release.go +++ b/cmd/wuffs/release.go @@ -24,13 +24,13 @@ import ( cf "github.com/google/wuffs/cmd/commonflags" ) -func genrelease(wuffsRoot string, langs []string, v cf.Version) error { +func genrelease(wuffsRoot string, langs []string, v cf.Version, cformatter string) 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, lang) + filename, contents, err := genreleaseLang(wuffsRoot, revision, commitDate, gitRevListCount, v, cformatter, lang) if err != nil { return err } @@ -41,7 +41,7 @@ func genrelease(wuffsRoot string, langs []string, v cf.Version) error { return nil } -func genreleaseLang(wuffsRoot string, revision string, commitDate, gitRevListCount string, v cf.Version, lang string) (filename string, contents []byte, err error) { +func genreleaseLang(wuffsRoot string, revision string, commitDate, gitRevListCount string, v cf.Version, cformatter string, lang string) (filename string, contents []byte, err error) { qualFilenames, err := findFiles(filepath.Join(wuffsRoot, "gen", lang), "."+lang) if err != nil { return "", nil, err @@ -57,6 +57,9 @@ 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{} diff --git a/cmd/wuffs/test.go b/cmd/wuffs/test.go index fd85e3d7..bb4725fc 100644 --- a/cmd/wuffs/test.go +++ b/cmd/wuffs/test.go @@ -116,7 +116,7 @@ func doBenchTest(wuffsRoot string, args []string, bench bool) error { return err } } - if err := genrelease(wuffsRoot, langs, cf.Version{}); err != nil { + if err := genrelease(wuffsRoot, langs, cf.Version{}, *cformatterFlag); err != nil { return err } } diff --git a/internal/cgen/cgen.go b/internal/cgen/cgen.go index f910e975..0a580a57 100644 --- a/internal/cgen/cgen.go +++ b/internal/cgen/cgen.go @@ -194,6 +194,10 @@ func Do(args []string) error { now = time.Now() } + if *cformatterFlag == "" { + return unformatted, nil + } + stdout := &bytes.Buffer{} cmd := exec.Command(*cformatterFlag, "-style=Chromium") cmd.Stdin = bytes.NewReader(unformatted)