From: Andrew Gerrand <adg@golang.org>
Date: Mon, 3 Mar 2014 01:50:29 +0000 (+1100)
Subject: misc/makerelease: use windows installer resources from local goroot
X-Git-Tag: go1.3beta1~516
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9d1940bc7423bf95def174a595bb014b3daa33ac;p=gostls13.git

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 cc67329df8..343fc4b5ec 100644
--- 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.