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://golang.org/cl/70670043

diff --git a/misc/makerelease/makerelease.go b/misc/makerelease/makerelease.go
index cc67329df8e369cf0a86c5b9aea3ded9db0617df..343fc4b5ecb1a835518330d7cd9c1055935bd80b 100644 (file)
--- a/misc/makerelease/makerelease.go
+++ b/misc/makerelease/makerelease.go
@@ -36,7 +36,6 @@ var (
        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 @@ func (b *Build) Do() error {
                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.