diff options
| author | Andrew Gerrand <adg@golang.org> | 2014-03-03 12:50:29 +1100 |
|---|---|---|
| committer | Andrew Gerrand <adg@golang.org> | 2014-03-03 12:50:29 +1100 |
| commit | 79a8ed873ffa1e933ede733e951884390ebcfe0f (patch) | |
| tree | 663f7ef7ee2f44d52b9d503bcf1bffdd8941bf45 /misc | |
| parent | 01328d2b4b23a684dac275a1788046ec85e36946 (diff) | |
| download | go-79a8ed873ffa1e933ede733e951884390ebcfe0f.tar.gz | |
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
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/makerelease/makerelease.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/misc/makerelease/makerelease.go b/misc/makerelease/makerelease.go index cc67329df..343fc4b5e 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. |