Issue 12075045: code review 12075045: misc/dist: include godoc from go.tools

LGTM



On Wed, Jul 31, 2013 at 6:31 PM, <adg@golang.org> wrote:

> Reviewers: golang-dev1,
>
> Message:
> Hello golang-dev@googlegroups.com,
>
> I'd like you to review this change to
> https://code.google.com/p/go
>
>
> Description:
> misc/dist: include godoc from go.tools
>
> Please review this at
https://codereview.appspot.**com/12075045/<https://codereview.appspot.com/120...
>
> Affected files:
>   M misc/dist/bindist.go
>
>
> Index: misc/dist/bindist.go
> ==============================**==============================**=======
> --- a/misc/dist/bindist.go
> +++ b/misc/dist/bindist.go
> @@ -31,7 +31,6 @@
>  var (
>         tag             = flag.String("tag", "release", "mercurial tag to
> check out")
>         repo            = flag.String("repo", "
> https://code.google.com/p/go"**, "repo URL")
> -       tourPath        = flag.String("tour", "code.google.com/p/go-tour",
> "Go tour repo import path")
>         verbose         = flag.Bool("v", false, "verbose output")
>         upload          = flag.Bool("upload", true, "upload resulting
> files to Google Code")
>         wxsFile         = flag.String("wxs", "", "path to custom
> installer.wxs")
> @@ -44,6 +43,8 @@
>
>  const (
>         uploadURL =
"https://go.googlecode.com/**files<https://go.googlecode.com/files>
> "
> +       godocPath =
"code.google.com/p/go.tools/**cmd/godoc<http://code.google.com/p/go.tools/cmd/godoc>
> "
> +       tourPath  = "code.google.com/p/go-tour"
>  )
>
>  var preBuildCleanFiles = []string{
> @@ -173,11 +174,11 @@
>         b.gopath = work
>
>         // Clone Go distribution and update to tag.
> -       _, err = b.run(work, "hg", "clone", "-q", *repo, b.root)
> +       _, err = b.hgCmd(work, "clone", *repo, b.root)
>         if err != nil {
>                 return err
>         }
> -       _, err = b.run(b.root, "hg", "update", *tag)
> +       _, err = b.hgCmd(b.root, "update", *tag)
>         if err != nil {
>                 return err
>         }
> @@ -214,7 +215,7 @@
>                                 return err
>                         }
>                         // Re-install std without -race, so that we're not
> left
> -                       // with a slower, race-enabled cmd/go, cmd/godoc,
> etc.
> +                       // with a slower, race-enabled cmd/go, etc.
>                         _, err = b.run(src, goCmd, "install", "-a", "std")
>                         // Re-building go command leaves old versions of
> go.exe as go.exe~ on windows.
>                         // See (*builder).copyFile in
> $GOROOT/src/cmd/go/build.go for details.
> @@ -226,6 +227,10 @@
>                 if err != nil {
>                         return err
>                 }
> +               err = b.godoc()
> +               if err != nil {
> +                       return err
> +               }
>                 err = b.tour()
>         }
>         if err != nil {
> @@ -408,6 +413,28 @@
>         return err
>  }
>
> +func (b *Build) godoc() error {
> +       defer func() {
> +               // Clean work files from GOPATH directory.
> +               for _, d := range []string{"bin", "pkg", "src"} {
> +                       os.RemoveAll(filepath.Join(b.**gopath, d))
> +               }
> +       }()
> +
> +       // 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)
> +       if err != nil {
> +               return err
> +       }
> +
> +       // Copy templates from go.tools/cmd/godoc/template to
> GOROOT/lib/godoc.
> +       return cpDir(
> +               filepath.Join(b.root, "lib", "godoc"),
> +               filepath.Join(b.gopath, "src",
> filepath.FromSlash(godocPath), "template"),
> +       )
> +}
> +
>  func (b *Build) tour() error {
>         defer func() {
>                 // Clean work files from GOPATH directory.
> @@ -417,13 +444,13 @@
>         }()
>
>         // go get the gotour package.
> -       _, err := b.run(b.gopath, filepath.Join(b.root, "bin", "go"),
> "get", *tourPath+"/gotour")
> +       _, err := b.run(b.gopath, filepath.Join(b.root, "bin", "go"),
> "get", tourPath+"/gotour")
>         if err != nil {
>                 return err
>         }
>
>         // Copy all the tour content to $GOROOT/misc/tour.
> -       importPath := filepath.FromSlash(*tourPath)
> +       importPath := filepath.FromSlash(tourPath)
>         tourSrc := filepath.Join(b.gopath, "src", importPath)
>         contentDir := filepath.Join(b.root, "misc", "tour")
>         if err = cpAllDir(contentDir, tourSrc, tourContent...); err != nil
> {
> @@ -436,14 +463,21 @@
>         }
>
>         // Copy gotour binary to tool directory as "tour"; invoked as "go
> tool tour".
> -       ext := ""
> +       return cp(
> +               filepath.Join(b.root, "pkg", "tool", b.OS+"_"+b.Arch,
> "tour"+ext()),
> +               filepath.Join(b.gopath, "bin", "gotour"+ext()),
> +       )
> +}
> +
> +func ext() string {
>         if runtime.GOOS == "windows" {
> -               ext = ".exe"
> +               return ".exe"
>         }
> -       return cp(
> -               filepath.Join(b.root, "pkg", "tool", b.OS+"_"+b.Arch,
> "tour"+ext),
> -               filepath.Join(b.gopath, "bin", "gotour"+ext),
> -       )
> +       return ""
> +}
> +
> +func (b *Build) hgCmd(dir string, args ...string) ([]byte, error) {
> +       return b.run(dir, "hg", append([]string{"--config",
> "extensions.codereview=!"}, args...)...)
>  }
>
>  func (b *Build) run(dir, name string, args ...string) ([]byte, error) {
>
>
> --
>
> ---You received this message because you are subscribed to the Google
> Groups "golang-dev" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to
golang-dev+unsubscribe@**googlegroups.com<golang-dev%2Bunsubscribe@googlegrou...
> .
> For more options, visit
https://groups.google.com/**groups/opt_out<https://groups.google.com/groups/o...
> .
>
>
>

adg

11 years, 10 months ago (2013-08-01 06:48:38 UTC) #3

*** Submitted as https://code.google.com/p/go/source/detail?r=913b557a2151 ***

misc/dist: include godoc from go.tools

R=golang-dev, bradfitz
CC=golang-dev
https://codereview.appspot.com/12075045

Expand All Messages | Collapse All Messages