commit d351361fee556d6beed6d43fba96c59dd4a3cca6
author Daniel Theophanes <kardianos@gmail.com> Thu Dec 15 14:49:47 2016 -0800
committer Daniel Theophanes <kardianos@gmail.com> Thu Dec 15 23:50:31 2016 +0000
tree f1b2d48b2d0c9176eaf0abd45e3a9227f501038d
parent d3e450898693f679c0814d8e0fac980f7fd09eb3

cmd/release: update releaselet to specify arch on windows msi

Fixes golang/go#17602

Change-Id: Ia7873d6a5e0226833b2e16a3486bc71f183a8442
Reviewed-on: https://go-review.googlesource.com/34502
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

cmd/release/releaselet.go

diff --git a/cmd/release/releaselet.go b/cmd/release/releaselet.go
index b088fec..17d5707 100644
--- a/cmd/release/releaselet.go
+++ b/cmd/release/releaselet.go
@@ -251,9 +251,21 @@
 		return err
 	}
 
+	msArch := func() string {
+		switch runtime.GOARCH {
+		default:
+			panic("unknown arch for windows " + runtime.GOARCH)
+		case "386":
+			return "x86"
+		case "amd64":
+			return "x64"
+		}
+	}
+
 	// Build package.
 	if err := runDir(win, filepath.Join(wix, "candle"),
 		"-nologo",
+		"-arch", msArch(),
 		"-dGoVersion="+version,
 		"-dWixGoVersion="+wixVersion(version),
 		"-dArch="+runtime.GOARCH,
@@ -498,7 +510,7 @@
 	    my.result.type = 'Warning';
 	    return false;
 	}
-    return true;    
+    return true;
 }
     </script>
     <choices-outline>
@@ -543,7 +555,7 @@
     UpgradeCode="$(var.UpgradeCode)" >
 
 <Package
-    Id='*' 
+    Id='*'
     Keywords='Installer'
     Description="The Go Programming Language Installer"
     Comments="The Go programming language is an open source project to make programmers more productive."
@@ -551,7 +563,6 @@
     Compressed="yes"
     InstallScope="perMachine"
     Languages="1033" />
-    <!--    Platform="x86 or x64" -->
 
 <Property Id="ARPCOMMENTS" Value="The Go programming language is a fast, statically typed, compiled language that feels like a dynamically typed, interpreted language." />
 <Property Id="ARPCONTACT" Value="golang-nuts@googlegroups.com" />
@@ -610,16 +621,16 @@
         Root="HKCU"
         Key="Software\GoProgrammingLanguage"
         Name="ShortCuts"
-        Type="integer" 
+        Type="integer"
         Value="1"
-        KeyPath="yes" /> 
+        KeyPath="yes" />
   </Component>
 </DirectoryRef>
 
 <!-- Registry & Environment Settings -->
 <DirectoryRef Id="GoEnvironmentEntries">
   <Component Id="Component_GoEnvironment" Guid="{3ec7a4d5-eb08-4de7-9312-2df392c45993}">
-    <RegistryKey 
+    <RegistryKey
         Root="HKCU"
         Key="Software\GoProgrammingLanguage"
         Action="create" >