qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-28 17:14:29 -06:00
Code Releases Activity

cmd/dist: new version for string for development branch

Browse Source 
Remove VERSION, which was forcing version to 'devel'.

Old:
$ go version
go version devel

New:
$ go version
go version devel +0a3866d6cc6b Mon Sep 24 20:08:05 2012 -0400

The date and time (and time zone) is that of the most recent commit,
not the time of the build itself. With some effort we could normalize
the zone, but I don't think it's worth the effort (more C coding,
since Mercurial is unhelpful).

R=r, dsymonds
CC=golang-dev
https://golang.org/cl/6569049
This commit is contained in:
Russ Cox 2012-09-24 21:35:20 -04:00
parent 10ea6519e4
commit 5c4e2570c1
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
VERSION
View File

@ -1 +0,0 @@
devel

2
src/cmd/api/goapi.go
View File

@ -100,7 +100,7 @@ func setContexts() {
func main() {
flag.Parse()
if !strings.Contains(runtime.Version(), "weekly") && runtime.Version() != "devel" {
if !strings.Contains(runtime.Version(), "weekly") && !strings.Contains(runtime.Version(), "devel") {
if *nextFile != "" {
fmt.Printf("Go version is %q, ignoring -next %s\n", runtime.Version(), *nextFile)
*nextFile = ""

8
src/cmd/dist/build.c vendored
View File

@ -207,7 +207,7 @@ findgoversion(void)
chomp(&branch);
// What are the tags along the current branch?
tag = "";
tag = "devel";
rev = ".";
run(&b, goroot, CheckExit, "hg", "log", "-b", bstr(&branch), "-r", ".:0", "--template", "{tags} + ", nil);
splitfields(&tags, bstr(&b));
@ -216,7 +216,9 @@ findgoversion(void)
p = tags.p[i];
if(streq(p, "+"))
nrev++;
if(hasprefix(p, "release.") || hasprefix(p, "weekly.") || hasprefix(p, "go")) {
// NOTE: Can reenable the /* */ code when we want to
// start reporting versions named 'weekly' again.
if(/*hasprefix(p, "weekly.") ||*/ hasprefix(p, "go")) {
tag = xstrdup(p);
// If this tag matches the current checkout
// exactly (no "+" yet), don't show extra
@ -236,7 +238,7 @@ findgoversion(void)
if(rev[0]) {
// Tag is before the revision we're building.
// Add extra information.
run(&bmore, goroot, CheckExit, "hg", "log", "--template", " +{node|short}", "-r", rev, nil);
run(&bmore, goroot, CheckExit, "hg", "log", "--template", " +{node|short} {date|date}", "-r", rev, nil);
chomp(&bmore);
}