aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/api
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2014-12-10 11:07:40 +1100
committerAndrew Gerrand <adg@golang.org>2014-12-12 14:01:01 +1100
commit77e96c9208d037157c31012c4db192c8b56c6c43 (patch)
treec259e5dd90b4d6a5d5810d6867518ebd03d8942c /src/cmd/api
parenteb91b5f2240f4444edb8975796e1d5695d054d73 (diff)
downloadgo-77e96c9208d037157c31012c4db192c8b56c6c43.tar.gz
go-77e96c9208d037157c31012c4db192c8b56c6c43.zip
[release-branch.go1.4] api: create go1.4.txt
I read through and vetted these but others should look too. LGTM=bradfitz, adg R=r, minux, bradfitz, adg CC=adg, golang-codereviews, gri, iant https://golang.org/cl/182560043
Diffstat (limited to 'src/cmd/api')
-rw-r--r--src/cmd/api/run.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/cmd/api/run.go b/src/cmd/api/run.go
index c323deb603..ed5613edd2 100644
--- a/src/cmd/api/run.go
+++ b/src/cmd/api/run.go
@@ -21,6 +21,7 @@ import (
"os/exec"
"os/user"
"path/filepath"
+ "runtime"
"strings"
)
@@ -53,7 +54,7 @@ func main() {
}
out, err = exec.Command("go", "tool", "api",
- "-c", file("go1", "go1.1", "go1.2", "go1.3"),
+ "-c", file("go1", "go1.1", "go1.2", "go1.3", "go1.4"),
"-next", file("next"),
"-except", file("except")).CombinedOutput()
if err != nil {
@@ -105,7 +106,7 @@ func prepGoPath() string {
}
// The GOPATH we'll return
- gopath := filepath.Join(os.TempDir(), "gopath-api-"+cleanUsername(username), goToolsVersion)
+ gopath := filepath.Join(os.TempDir(), "gopath-api-"+cleanUsername(username)+"-"+cleanUsername(strings.Fields(runtime.Version())[0]), goToolsVersion)
// cloneDir is where we run "hg clone".
cloneDir := filepath.Join(gopath, "src", "code.google.com", "p")