Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(36)

Delta Between Two Patch Sets: misc/dist/windows/installer.wxs

Issue 5901044: code review 5901044: windows: install fixes (Closed)
Left Patch Set: Created 12 years ago
Right Patch Set: diff -r baeb068aac25 https://go.googlecode.com/hg/ Created 12 years ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
(no file at all)
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> 2 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3 <!-- 3 <!--
4 # Copyright 2010 The Go Authors. All rights reserved. 4 # Copyright 2010 The Go Authors. All rights reserved.
5 # Use of this source code is governed by a BSD-style 5 # Use of this source code is governed by a BSD-style
6 # license that can be found in the LICENSE file. 6 # license that can be found in the LICENSE file.
7 --> 7 -->
8 8
9 <?if $(var.Arch) = 386 ?> 9 <?if $(var.Arch) = 386 ?>
10 <?define ProdId = {FF5B30B2-08C2-11E1-85A2-6ACA4824019B} ?> 10 <?define ProdId = {FF5B30B2-08C2-11E1-85A2-6ACA4824019B} ?>
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 <Property Id="ARPCONTACT" Value="golang-nuts@googlegroups.com" /> 44 <Property Id="ARPCONTACT" Value="golang-nuts@googlegroups.com" />
45 <Property Id="ARPHELPLINK" Value="golang.org/doc/community.html" /> 45 <Property Id="ARPHELPLINK" Value="golang.org/doc/community.html" />
46 <Property Id="ARPREADME" Value="golang.org" /> 46 <Property Id="ARPREADME" Value="golang.org" />
47 <Property Id="ARPURLINFOABOUT" Value="golang.org" /> 47 <Property Id="ARPURLINFOABOUT" Value="golang.org" />
48 <Property Id="LicenseAccepted">1</Property> 48 <Property Id="LicenseAccepted">1</Property>
49 <Icon Id="gopher.ico" SourceFile="images\gopher.ico"/> 49 <Icon Id="gopher.ico" SourceFile="images\gopher.ico"/>
50 <Property Id="ARPPRODUCTICON" Value="gopher.ico" /> 50 <Property Id="ARPPRODUCTICON" Value="gopher.ico" />
51 <Media Id='1' Cabinet="go.cab" EmbedCab="yes" CompressionLevel="high" /> 51 <Media Id='1' Cabinet="go.cab" EmbedCab="yes" CompressionLevel="high" />
52 <Condition Message="Windows 2000 or greater required."> VersionNT >= 500</Condit ion> 52 <Condition Message="Windows 2000 or greater required."> VersionNT >= 500</Condit ion>
53 <MajorUpgrade AllowDowngrades="yes" /> 53 <MajorUpgrade AllowDowngrades="yes" />
54 <SetDirectory Id="INSTALLDIRROOT" Value="[%SYSTEMDRIVE]"/>
54 55
55 <CustomAction 56 <CustomAction
56 Id="SetApplicationRootDirectory" 57 Id="SetApplicationRootDirectory"
57 Property="ARPINSTALLLOCATION" 58 Property="ARPINSTALLLOCATION"
58 Value="[INSTALLDIR]" /> 59 Value="[INSTALLDIR]" />
59 60
60 <!-- Define the directory structure and environment variables --> 61 <!-- Define the directory structure and environment variables -->
61 <Directory Id="TARGETDIR" Name="SourceDir"> 62 <Directory Id="TARGETDIR" Name="SourceDir">
62 <Directory Id="INSTALLDIRROOT"> 63 <Directory Id="INSTALLDIRROOT">
63 <Directory Id="INSTALLDIR" Name="Go"/> 64 <Directory Id="INSTALLDIR" Name="Go"/>
64 </Directory> 65 </Directory>
65 <Directory Id="ProgramMenuFolder"> 66 <Directory Id="ProgramMenuFolder">
66 <Directory Id="GoProgramShortcutsDir" Name="Go Programming Language"/> 67 <Directory Id="GoProgramShortcutsDir" Name="Go Programming Language"/>
67 </Directory> 68 </Directory>
68 <Directory Id="EnvironmentEntries"> 69 <Directory Id="EnvironmentEntries">
69 <Directory Id="GoEnvironmentEntries" Name="Go Programming Language"/> 70 <Directory Id="GoEnvironmentEntries" Name="Go Programming Language"/>
70 </Directory> 71 </Directory>
71 </Directory> 72 </Directory>
72 73
73 <!-- Programs Menu Shortcuts --> 74 <!-- Programs Menu Shortcuts -->
74 <DirectoryRef Id="GoProgramShortcutsDir"> 75 <DirectoryRef Id="GoProgramShortcutsDir">
75 <Component Id="Component_GoProgramShortCuts" Guid="{f5fbfb5e-6c5c-423b-9298-21 b0e3c98f4b}" Win64="$(var.IsX64Target)"> 76 <Component Id="Component_GoProgramShortCuts" Guid="{f5fbfb5e-6c5c-423b-9298-21 b0e3c98f4b}">
76 <Shortcut 77 <Shortcut
77 Id="GoDocServerStartMenuShortcut" 78 Id="GoDocServerStartMenuShortcut"
78 Name="GoDocServer" 79 Name="GoDocServer"
79 Description="Starts the Go documentation server (http://localhost:6060)" 80 Description="Starts the Go documentation server (http://localhost:6060)"
80 Show="minimized" 81 Show="minimized"
81 Arguments='/c start "Godoc Server http://localhost:6060" "[INSTALLDIR]bi n\godoc.exe" -http=localhost:6060 -goroot="[INSTALLDIR]." &amp;&amp; start http: //localhost:6060' 82 Arguments='/c start "Godoc Server http://localhost:6060" "[INSTALLDIR]bi n\godoc.exe" -http=localhost:6060 -goroot="[INSTALLDIR]." &amp;&amp; start http: //localhost:6060'
82 Icon="gopher.ico" 83 Icon="gopher.ico"
83 Target="[%ComSpec]" /> 84 Target="[%ComSpec]" />
84 <Shortcut 85 <Shortcut
85 Id="UninstallShortcut" 86 Id="UninstallShortcut"
86 Name="Uninstall Go" 87 Name="Uninstall Go"
87 Description="Uninstalls Go and all of its components" 88 Description="Uninstalls Go and all of its components"
88 Target="[$(var.SysFolder)]msiexec.exe" 89 Target="[$(var.SysFolder)]msiexec.exe"
89 Arguments="/x [ProductCode]" /> 90 Arguments="/x [ProductCode]" />
90 <RemoveFolder 91 <RemoveFolder
91 Id="GoProgramShortcutsDir" 92 Id="GoProgramShortcutsDir"
92 On="uninstall" /> 93 On="uninstall" />
93 <RegistryValue 94 <RegistryValue
94 Root="HKCU" 95 Root="HKCU"
95 Key="Software\GoProgrammingLanguage" 96 Key="Software\GoProgrammingLanguage"
96 Name="ShortCuts" 97 Name="ShortCuts"
97 Type="integer"· 98 Type="integer"·
98 Value="1" 99 Value="1"
99 KeyPath="yes" />· 100 KeyPath="yes" />·
100 </Component> 101 </Component>
101 </DirectoryRef> 102 </DirectoryRef>
102 103
103 <!-- Registry & Environment Settings --> 104 <!-- Registry & Environment Settings -->
104 <DirectoryRef Id="GoEnvironmentEntries"> 105 <DirectoryRef Id="GoEnvironmentEntries">
105 <Component Id="Component_GoEnvironment" Guid="{3ec7a4d5-eb08-4de7-9312-2df392c 45993}" Win64="$(var.IsX64Target)"> 106 <Component Id="Component_GoEnvironment" Guid="{3ec7a4d5-eb08-4de7-9312-2df392c 45993}">
106 <RegistryKey· 107 <RegistryKey·
107 Root="HKCU" 108 Root="HKCU"
108 Key="Software\GoProgrammingLanguage" 109 Key="Software\GoProgrammingLanguage"
109 Action="create" > 110 Action="create" >
110 <RegistryValue 111 <RegistryValue
111 Name="installed" 112 Name="installed"
112 Type="integer" 113 Type="integer"
113 Value="1" 114 Value="1"
114 KeyPath="yes" /> 115 KeyPath="yes" />
115 <RegistryValue 116 <RegistryValue
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 157
157 <!-- Include the user interface --> 158 <!-- Include the user interface -->
158 <WixVariable Id="WixUILicenseRtf" Value="LICENSE.rtf" /> 159 <WixVariable Id="WixUILicenseRtf" Value="LICENSE.rtf" />
159 <WixVariable Id="WixUIBannerBmp" Value="images\Banner.jpg" /> 160 <WixVariable Id="WixUIBannerBmp" Value="images\Banner.jpg" />
160 <WixVariable Id="WixUIDialogBmp" Value="images\Dialog.jpg" /> 161 <WixVariable Id="WixUIDialogBmp" Value="images\Dialog.jpg" />
161 <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" /> 162 <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
162 <UIRef Id="WixUI_InstallDir" /> 163 <UIRef Id="WixUI_InstallDir" />
163 164
164 </Product> 165 </Product>
165 </Wix> 166 </Wix>
LEFTRIGHT
« no previous file | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b