aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Gerrand <adg@golang.org>2012-03-26 17:32:20 +1100
committerAndrew Gerrand <adg@golang.org>2012-03-26 17:32:20 +1100
commitbfdc45a456d5931e670f299ab7b4f68ecf570bff (patch)
tree3bffaaae184944ae7e446c89d3315866a828a36e
parent072646cd172137bacf62008e4aa0f28fd7d58e95 (diff)
downloadgo-bfdc45a456d5931e670f299ab7b4f68ecf570bff.tar.gz
go-bfdc45a456d5931e670f299ab7b4f68ecf570bff.zip
misc/dist: add -wxs flag to provide custom installer.wxs file
R=golang-dev, r CC=golang-dev https://golang.org/cl/5908055
-rw-r--r--misc/dist/bindist.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/misc/dist/bindist.go b/misc/dist/bindist.go
index b03fd706db..115049aa68 100644
--- a/misc/dist/bindist.go
+++ b/misc/dist/bindist.go
@@ -33,6 +33,7 @@ var (
repo = flag.String("repo", "https://code.google.com/p/go", "repo URL")
verbose = flag.Bool("v", false, "verbose output")
upload = flag.Bool("upload", true, "upload resulting files to Google Code")
+ wxsFile = flag.String("wxs", "", "path to custom installer.wxs")
username, password string // for Google Code upload
)
@@ -248,6 +249,9 @@ func (b *Build) Do() error {
// Create MSI installer.
win := filepath.Join(b.root, "misc/dist/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.