-
Notifications
You must be signed in to change notification settings - Fork 159
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <[email protected]>
- Loading branch information
Showing
1 changed file
with
17 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -251,9 +251,21 @@ func windowsMSI() error { | |
| 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 @@ function installCheck() { | |
| my.result.type = 'Warning'; | ||
| return false; | ||
| } | ||
| return true; | ||
| return true; | ||
| } | ||
| </script> | ||
| <choices-outline> | ||
|
|
@@ -543,15 +555,14 @@ var windowsData = map[string]string{ | |
| 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." | ||
| InstallerVersion="300" | ||
| 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="[email protected]" /> | ||
|
|
@@ -610,16 +621,16 @@ var windowsData = map[string]string{ | |
| 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" > | ||
|
|
||