qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-12 02:50:25 -07:00
Code Releases Activity

misc/dist: include cover and vet, add -tool flag to specify go.tools tag

Browse Source 
Fixes #6356.

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/13333052
This commit is contained in:
Andrew Gerrand 2013-09-13 10:28:30 +10:00
parent 3c11dd8ebc
commit 73790d407c
1 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
misc/dist/bindist.go vendored
View File

@ -30,6 +30,7 @@ import (
var (
tag = flag.String("tag", "release", "mercurial tag to check out")
toolTag = flag.String("tool", defaultToolTag, "go.tools tag to check out")
repo = flag.String("repo", "https://code.google.com/p/go", "repo URL")
verbose = flag.Bool("v", false, "verbose output")
upload = flag.Bool("upload", true, "upload resulting files to Google Code")
@ -42,11 +43,21 @@ var (
)
const (
uploadURL = "https://go.googlecode.com/files"
godocPath = "code.google.com/p/go.tools/cmd/godoc"
tourPath = "code.google.com/p/go-tour"
uploadURL = "https://go.googlecode.com/files"
tourPath = "code.google.com/p/go-tour"
toolPath = "code.google.com/p/go.tools"
defaultToolTag = "tip" // TOOD(adg): set this once Go 1.2 settles
)
// Import paths for tool commands.
// These must be the command that cmd/go knows to install to $GOROOT/bin
// or $GOROOT/pkg/tool.
var toolPaths = []string{
"code.google.com/p/go.tools/cmd/cover",
"code.google.com/p/go.tools/cmd/godoc",
"code.google.com/p/go.tools/cmd/vet",
}
var preBuildCleanFiles = []string{
"lib/codereview",
"misc/dashboard/godashboard",
@ -75,12 +86,11 @@ var tourPackages = []string{
}
var tourContent = []string{
"content",
"js",
"prog",
"solutions",
"static",
"template",
"tour.article",
}
// The os-arches that support the race toolchain.
@ -227,7 +237,7 @@ func (b *Build) Do() error {
if err != nil {
return err
}
err = b.godoc()
err = b.tools()
if err != nil {
return err
}
@ -413,7 +423,7 @@ func (b *Build) Do() error {
return err
}
func (b *Build) godoc() error {
func (b *Build) tools() error {
defer func() {
// Clean work files from GOPATH directory.
for _, d := range []string{"bin", "pkg", "src"} {
@ -421,9 +431,23 @@ func (b *Build) godoc() error {
}
}()
// go get the godoc package.
// The go tool knows to install to $GOROOT/bin.
_, err := b.run(b.gopath, filepath.Join(b.root, "bin", "go"), "get", godocPath)
// Fetch the tool packages (without building/installing).
args := append([]string{"get", "-d"}, toolPaths...)
_, err := b.run(b.gopath, filepath.Join(b.root, "bin", "go"), args...)
if err != nil {
return err
}
// Update the repo to the revision specified by -tool.
repoPath := filepath.Join(b.gopath, "src", filepath.FromSlash(toolPath))
_, err = b.run(repoPath, "hg", "update", *toolTag)
if err != nil {
return err
}
// Install tools.
args = append([]string{"install"}, toolPaths...)
_, err = b.run(b.gopath, filepath.Join(b.root, "bin", "go"), args...)
return err
}