qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 21:01:31 -07:00
Code Releases Activity

misc/makerelease: use windows installer resources from local goroot

Browse Source 
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
This commit is contained in:
Andrew Gerrand 2014-03-03 12:50:29 +11:00
parent 77edde1a1e
commit 9d1940bc74
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
misc/makerelease/makerelease.go
View File

@ -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.