cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-05 23:53:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

misc/makerelease: handle git sub-repositories

Browse Source 
Also: checkout sub-repos from Mercurial manually
instead of using "go get". (for the 1.4 release)

LGTM=rsc
R=rsc
CC=golang-codereviews
https://golang.org/cl/190720043
This commit is contained in:
Andrew Gerrand 2014-12-10 13:04:06 +11:00
parent f9ae81edca
commit 031850b689
1 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
misc/makerelease/makerelease.go
View File

@ -14,6 +14,7 @@ import (
"compress/gzip" "compress/gzip"
"crypto/sha1" "crypto/sha1"
"encoding/json" "encoding/json"
"errors"
"flag" "flag"
"fmt" "fmt"
"io" "io"
@ -30,7 +31,7 @@ import (
"strings" "strings"
"code.google.com/p/goauth2/oauth" "code.google.com/p/goauth2/oauth"
storage "code.google.com/p/google-api-go-client/storage/v1beta2" storage "code.google.com/p/google-api-go-client/storage/v1"
) )
var ( var (
@ -56,8 +57,8 @@ const (
blogPath = "golang.org/x/blog" blogPath = "golang.org/x/blog"
toolPath = "golang.org/x/tools" toolPath = "golang.org/x/tools"
tourPath = "code.google.com/p/go-tour" tourPath = "code.google.com/p/go-tour"
defaultToolTag = "release-branch.go1.3" defaultToolTag = "release-branch.go1.4"
defaultTourTag = "release-branch.go1.3" defaultTourTag = "release-branch.go1.4"
) )
// Import paths for tool commands. // Import paths for tool commands.
@ -504,16 +505,38 @@ func (b *Build) extras() error {
} }
func (b *Build) get(repoPath, revision string) error { func (b *Build) get(repoPath, revision string) error {
// Fetch the packages (without building/installing). dest := filepath.Join(b.gopath, "src", filepath.FromSlash(repoPath))
_, err := b.run(b.gopath, filepath.Join(b.root, "bin", "go"),
"get", "-d", repoPath+"/...") if strings.HasPrefix(repoPath, "golang.org/x/") {
if err != nil { // For sub-repos, fetch the old Mercurial repo; bypass "go get".
return err // DO NOT import this special case into the git tree.
if err := os.MkdirAll(filepath.Dir(dest), 0755); err != nil {
return err
}
repo := strings.Replace(repoPath, "golang.org/x/", "https://code.google.com/p/go.", 1)
if _, err := b.run(b.gopath, "hg", "clone", repo, dest); err != nil {
return err
}
} else {
// Fetch the packages (without building/installing).
_, err := b.run(b.gopath, filepath.Join(b.root, "bin", "go"),
"get", "-d", repoPath+"/...")
if err != nil {
return err
}
} }
// Update the repo to the specified revision. // Update the repo to the specified revision.
p := filepath.Join(b.gopath, "src", filepath.FromSlash(repoPath)) var err error
_, err = b.run(p, "hg", "update", revision) switch {
case exists(filepath.Join(dest, ".git")):
_, err = b.run(dest, "git", "checkout", revision)
case exists(filepath.Join(dest, ".hg")):
_, err = b.run(dest, "hg", "update", revision)
default:
err = errors.New("unknown version control system")
}
return err return err
} }