From ad9931ff2e294cc3f326570e622cfd3bc38400b1 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 23 Jun 2018 07:11:45 +1000 Subject: [PATCH] Generate the release .h the same as gen/etc/*.h --- cmd/wuffs-c/release.go | 4 ++++ cmd/wuffs/gen.go | 7 ++++--- cmd/wuffs/release.go | 38 ++++++++++++++++++++++++-------------- 3 files changed, 32 insertions(+), 17 deletions(-) diff --git a/cmd/wuffs-c/release.go b/cmd/wuffs-c/release.go index 5f98e81a..205aa893 100644 --- a/cmd/wuffs-c/release.go +++ b/cmd/wuffs-c/release.go @@ -67,6 +67,8 @@ func doGenrelease(args []string) error { if i := bytes.Index(s, grCHeader); i >= 0 { s = s[:i] + } else { + return fmt.Errorf("could not find %q", grCHeader) } if err := h.gen(unformatted, s); err != nil { @@ -75,6 +77,8 @@ func doGenrelease(args []string) error { } unformatted.WriteString("\n\n#endif // WUFFS_INCLUDE_GUARD\n\n") + unformatted.Write(grCHeader) + unformatted.WriteString("\n") // Then, cat all of the implementations together, filtering out duplicate // WUFFS_INCLUDE_GUARD__BASE_PRIVATE sections. diff --git a/cmd/wuffs/gen.go b/cmd/wuffs/gen.go index 19043c2d..14b1d4ea 100644 --- a/cmd/wuffs/gen.go +++ b/cmd/wuffs/gen.go @@ -183,10 +183,11 @@ func (h *genHelper) genDir(dirname string, qualFilenames []string) error { if lang != "c" || packageName == "base" { continue } - if i := bytes.Index(out, cHeaderEndsHere); i < 0 { - return fmt.Errorf("%s: output did not contain %q", command, cHeaderEndsHere) - } else { + + if i := bytes.Index(out, cHeaderEndsHere); i >= 0 { out = out[:i] + } else { + return fmt.Errorf("%s: output did not contain %q", command, cHeaderEndsHere) } if err := h.genFile(dirname, "h", out); err != nil { return err diff --git a/cmd/wuffs/release.go b/cmd/wuffs/release.go index f7af9efc..a20f2d71 100644 --- a/cmd/wuffs/release.go +++ b/cmd/wuffs/release.go @@ -57,23 +57,36 @@ func doGenrelease(wuffsRoot string, args []string) error { revision := findRevision(wuffsRoot) for _, lang := range langs { - if err := doGenrelease1(wuffsRoot, revision, v, lang, lang); err != nil { + filename, contents, err := doGenrelease1(wuffsRoot, revision, v, lang) + if err != nil { + return err + } + if err := writeFile(filename, contents); err != nil { return err } - if lang == "c" { - if err := doGenrelease1(wuffsRoot, revision, v, "c", "h"); err != nil { - return err - } + // Special-case the "c" generator to also write a .h file. + if lang != "c" { + continue + } + + filename = filename[:len(filename)-1] + "h" + if i := bytes.Index(contents, cHeaderEndsHere); i >= 0 { + contents = contents[:i] + } else { + return fmt.Errorf("wuffs-c output did not contain %q", cHeaderEndsHere) + } + if err := writeFile(filename, contents); err != nil { + return err } } return nil } -func doGenrelease1(wuffsRoot string, revision string, v cf.Version, lang string, suffix string) error { - qualFilenames, err := findFiles(filepath.Join(wuffsRoot, "gen", suffix), "."+suffix) +func doGenrelease1(wuffsRoot string, revision 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 err + return "", nil, err } command := "wuffs-" + lang @@ -88,16 +101,13 @@ func doGenrelease1(wuffsRoot string, revision string, v cf.Version, lang string, if err := cmd.Run(); err == nil { // No-op. } else if _, ok := err.(*exec.ExitError); ok { - return fmt.Errorf("%s: failed", command) + return "", nil, fmt.Errorf("%s: failed", command) } else { - return err + return "", nil, err } wv := fmt.Sprintf("wuffs-v%d.%d", v.Major, v.Minor) - return writeFile( - filepath.Join(wuffsRoot, "release", lang, wv, wv+"."+suffix), - stdout.Bytes(), - ) + return filepath.Join(wuffsRoot, "release", lang, wv, wv+"."+lang), stdout.Bytes(), nil } func findRevision(wuffsRoot string) string {