windows: install fixes

* set default installation drive to C:\
* remove Win64 component property

R=golang-dev, bradfitz, aram
CC=golang-dev
https://golang.org/cl/5901044

diff --git a/misc/dist/windows/installer.wxs b/misc/dist/windows/installer.wxs
index 20f261f9d04d6631c0f9a66257649955d666bb9f..b170b98dc4572c50b50a0a699d629114f4d8e29f 100644 (file)
--- a/misc/dist/windows/installer.wxs
+++ b/misc/dist/windows/installer.wxs
@@ -10,12 +10,10 @@
   <?define ProdId = {FF5B30B2-08C2-11E1-85A2-6ACA4824019B} ?>\r
   <?define UpgradeCode = {1C3114EA-08C3-11E1-9095-7FCA4824019B} ?>\r
   <?define SysFolder=SystemFolder ?>\r
-  <?define IsX64Target = no ?>\r
 <?else?>\r
   <?define ProdId = {716c3eaa-9302-48d2-8e5e-5cfec5da2fab} ?>\r
   <?define UpgradeCode = {22ea7650-4ac6-4001-bf29-f4b8775db1c0} ?>\r
   <?define SysFolder=System64Folder ?>\r
-  <?define IsX64Target = yes ?>\r
 <?endif?>\r
 \r
 <Product\r
@@ -51,6 +49,7 @@
 <Media Id='1' Cabinet="go.cab" EmbedCab="yes" CompressionLevel="high" />\r
 <Condition Message="Windows 2000 or greater required."> VersionNT >= 500</Condition>\r
 <MajorUpgrade AllowDowngrades="yes" />\r
+<SetDirectory Id="INSTALLDIRROOT" Value="[%SYSTEMDRIVE]"/>\r
 \r
 <CustomAction\r
     Id="SetApplicationRootDirectory"\r
@@ -72,7 +71,7 @@
 \r
 <!-- Programs Menu Shortcuts -->\r
 <DirectoryRef Id="GoProgramShortcutsDir">\r
-  <Component Id="Component_GoProgramShortCuts" Guid="{f5fbfb5e-6c5c-423b-9298-21b0e3c98f4b}" Win64="$(var.IsX64Target)">\r
+  <Component Id="Component_GoProgramShortCuts" Guid="{f5fbfb5e-6c5c-423b-9298-21b0e3c98f4b}">\r
     <Shortcut\r
         Id="GoDocServerStartMenuShortcut"\r
         Name="GoDocServer"\r
@@ -102,7 +101,7 @@
 \r
 <!-- Registry & Environment Settings -->\r
 <DirectoryRef Id="GoEnvironmentEntries">\r
-  <Component Id="Component_GoEnvironment" Guid="{3ec7a4d5-eb08-4de7-9312-2df392c45993}" Win64="$(var.IsX64Target)">\r
+  <Component Id="Component_GoEnvironment" Guid="{3ec7a4d5-eb08-4de7-9312-2df392c45993}">\r
     <RegistryKey \r
         Root="HKCU"\r
         Key="Software\GoProgrammingLanguage"\r