diff --git a/cmd/wuffs-c/release.go b/cmd/wuffs-c/release.go index 5d35bd50..2399ac90 100644 --- a/cmd/wuffs-c/release.go +++ b/cmd/wuffs-c/release.go @@ -24,7 +24,6 @@ import ( "path/filepath" "sort" "strings" - "time" cf "github.com/google/wuffs/cmd/commonflags" ) @@ -32,6 +31,7 @@ import ( func doGenrelease(args []string) error { flags := flag.FlagSet{} cformatterFlag := flags.String("cformatter", cf.CformatterDefault, cf.CformatterUsage) + commitDateFlag := flags.String("commitdate", "", "git commit date the release was built from") gitRevListCountFlag := flags.Int("gitrevlistcount", 0, `git "rev-list --count" that the release was built from`) revisionFlag := flags.String("revision", "", "git revision the release was built from") versionFlag := flags.String("version", cf.VersionDefault, cf.VersionUsage) @@ -45,6 +45,9 @@ func doGenrelease(args []string) error { if (*gitRevListCountFlag < 0) || (0x7FFFFFFF < *gitRevListCountFlag) { return fmt.Errorf("bad -gitrevlistcount flag value %d", *gitRevListCountFlag) } + if !cf.IsAlphaNumericIsh(*commitDateFlag) { + return fmt.Errorf("bad -commitdate flag value %q", *commitDateFlag) + } if !cf.IsAlphaNumericIsh(*revisionFlag) { return fmt.Errorf("bad -revision flag value %q", *revisionFlag) } @@ -71,6 +74,7 @@ func doGenrelease(args []string) error { filesList: nil, filesMap: map[string]parsedCFile{}, seen: nil, + commitDate: *commitDateFlag, gitRevListCount: *gitRevListCountFlag, revision: *revisionFlag, version: v, @@ -157,6 +161,7 @@ type genReleaseHelper struct { filesList []string filesMap map[string]parsedCFile seen map[string]bool + commitDate string gitRevListCount int revision string version cf.Version @@ -278,10 +283,9 @@ func (h *genReleaseHelper) substituteWuffsVersion(s []byte) ([]byte, error) { } w := bytes.NewBuffer(nil) - fmt.Fprintf(w, "// WUFFS_VERSION was overridden by \"wuffs gen -version\" on %v UTC", - time.Now().UTC().Format("2006-01-02")) - if h.revision != "" { - fmt.Fprintf(w, ",\n// based on revision %s", h.revision) + fmt.Fprintf(w, `// WUFFS_VERSION was overridden by "wuffs gen -version"`) + if h.revision != "" && h.commitDate != "" { + fmt.Fprintf(w, " based on revision\n// %s committed on %s", h.revision, h.commitDate) } fmt.Fprintf(w, `. diff --git a/cmd/wuffs/release.go b/cmd/wuffs/release.go index f55bca10..ada21ac9 100644 --- a/cmd/wuffs/release.go +++ b/cmd/wuffs/release.go @@ -26,9 +26,11 @@ import ( 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, gitRevListCount, v, lang) + filename, contents, err := genreleaseLang(wuffsRoot, revision, commitDate, gitRevListCount, v, lang) if err != nil { return err } @@ -39,7 +41,7 @@ func genrelease(wuffsRoot string, langs []string, v cf.Version) error { return nil } -func genreleaseLang(wuffsRoot string, revision string, 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, lang string) (filename string, contents []byte, err error) { qualFilenames, err := findFiles(filepath.Join(wuffsRoot, "gen", lang), "."+lang) if err != nil { return "", nil, err @@ -47,7 +49,11 @@ func genreleaseLang(wuffsRoot string, revision string, gitRevListCount string, v command := "wuffs-" + lang args := []string(nil) - args = append(args, "genrelease", "-revision", revision, "-version", v.String()) + args = append(args, "genrelease", + "-revision", revision, + "-commitdate", commitDate, + "-version", v.String(), + ) if gitRevListCount != "" { args = append(args, "-gitrevlistcount", gitRevListCount) } @@ -75,6 +81,7 @@ func genreleaseLang(wuffsRoot string, revision string, gitRevListCount string, v func runGitCommand(wuffsRoot string, cmdArgs ...string) string { cmd := exec.Command("git", cmdArgs...) cmd.Dir = wuffsRoot + cmd.Env = []string{"TZ=UTC"} out, err := cmd.Output() if err != nil { return ""