From: Andrew Gerrand <adg@golang.org>
Date: Mon, 26 Mar 2012 06:32:20 +0000 (+1100)
Subject: misc/dist: add -wxs flag to provide custom installer.wxs file
X-Git-Tag: weekly~42
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=bfdc45a456d5931e670f299ab7b4f68ecf570bff;p=gostls13.git

misc/dist: add -wxs flag to provide custom installer.wxs file

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/5908055
---

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.