code review 70670043: misc/makerelease: use windows installer resources from ...

misc/makerelease: use windows installer resources from local goroot

This broke when we renamed the tool, and I missed this fix when I
fixed darwin last week.

[adg, 2014-03-03 01:41:28]

Hello golang-codereviews@googlegroups.com,

I'd like you to review this change to
https://code.google.com/p/go

[minux1, 2014-03-03 01:47:24]

LGTM.

[bradfitz, 2014-03-03 01:47:32]

LGTM
 On Mar 2, 2014 5:41 PM, <adg@golang.org> wrote:

> Reviewers: golang-codereviews,
>
> Message:
> Hello golang-codereviews@googlegroups.com,
>
> I'd like you to review this change to
> https://code.google.com/p/go
>
>
> Description:
> misc/makerelease: use windows installer resources from local goroot
>
> This broke when we renamed the tool, and I missed this fix when I
> fixed darwin last week.
>
> Please review this at https://codereview.appspot.com/70670043/
>
> Affected files (+1, -5 lines):
>   misc/makerelease/makerelease.go
>
>
> Index: misc/makerelease/makerelease.go
> ===================================================================
> --- a/misc/makerelease/makerelease.go
> +++ b/misc/makerelease/makerelease.go
> @@ -36,7 +36,6 @@
>         repo            = flag.String("repo", "
> https://code.google.com/p/go", "repo URL")
>         verbose         = flag.Bool("v", false, "verbose output")
>         upload          = flag.Bool("upload", false, "upload resulting
> files to Google Code")
> -       wxsFile         = flag.String("wxs", "", "path to custom
> installer.wxs")
>         addLabel        = flag.String("label", "", "additional label to
> apply to file when uploading")
>         includeRace     = flag.Bool("race", true, "build race detector
> packages")
>         versionOverride = flag.String("version", "", "override version
> name")
> @@ -399,11 +398,8 @@
>                 targs = append(targs, targ)
>
>                 // Create MSI installer.
> -               win := filepath.Join(b.root, "misc/makerelease/windows")
> +               win := filepath.Join(runtime.GOROOT(),
> "misc/makerelease/windows")
>                 installer := filepath.Join(win, "installer.wxs")
> -               if *wxsFile != "" {
> -                       installer = *wxsFile
> -               }
>                 appfiles := filepath.Join(work, "AppFiles.wxs")
>                 msi := filepath.Join(work, "installer.msi")
>                 // Gather files.
>
>
> --
> You received this message because you are subscribed to the Google Groups
> "golang-codereviews" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to golang-codereviews+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/groups/opt_out.
>

[adg, 2014-03-03 01:50:33]

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

misc/makerelease: use windows installer resources from local goroot

This broke when we renamed the tool, and I missed this fix when I
fixed darwin last week.

LGTM=minux.ma, bradfitz
R=golang-codereviews, minux.ma, bradfitz
CC=golang-codereviews
https://codereview.appspot.com/70670043

[gobot, 2014-03-03 01:55:27]

This CL appears to have broken the windows-amd64-race builder.