Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

stable wix: update to TortoiseOverlays 1.0.13 and merge both msn's

1.0.13 fixes the duplicate component GUID error we were seeing, which now
allows us to merge both the x86 and the x64 TortoiseOverlays merge module
into our x64 installer for the x86 shell integration feature.

Changeset 443e7c87bef2…

Parent f2b9f25e4369…

by Adrian Buehlmann

Changes to one file · Browse files at 443e7c87bef2 Showing diff from parent f2b9f25e4369 Diff from another changeset...

Change 1 of 3 Show Entire File contrib/​wix/​tortoisehg.wxs Stacked
 
173
174
175
176
 
177
178
179
 
182
183
184
185
186
187
188
 
189
190
191
192
193
194
195
196
 
249
250
251
252
 
253
254
255
 
173
174
175
 
176
177
178
179
 
182
183
184
 
185
186
 
187
188
189
 
 
 
190
191
192
 
245
246
247
 
248
249
250
251
@@ -173,7 +173,7 @@
  </Directory>   </Directory -->   - <?define TOverlaysVersion = 1.0.11.18359 ?> + <?define TOverlaysVersion = 1.0.13.18745 ?>   <?define TOverlaysSrcDir = ..\contrib\TortoiseOverlays ?>   <?define TOverlaysSrcFilenameX86 = TortoiseOverlays-$(var.TOverlaysVersion)-win32.msm ?>   <?define TOverlaysSrcFilenameX64 = TortoiseOverlays-$(var.TOverlaysVersion)-x64.msm ?> @@ -182,15 +182,11 @@
  SourceFile='C:\Program Files\Microsoft SDKs\Windows\v7.0\Redist\VC\microsoft.vcxx.crt.x86_msm.msm' />   <Merge Id='VCRedistPolicy' DiskId='1' Language='1033'   SourceFile='C:\Program Files\Microsoft SDKs\Windows\v7.0\Redist\VC\policy.x.xx.microsoft.vcxx.crt.x86_msm.msm' /> - <?if $(var.Platform) = "x86" ?>   <Merge Id='TortoiseOverlaysMergeX86' Language='0' DiskId='1'   SourceFile='$(var.TOverlaysSrcDir)\$(var.TOverlaysSrcFilenameX86)' /> - <?elseif $(var.Platform) = "x64" ?> + <?if $(var.Platform) = "x64" ?>   <Merge Id='TortoiseOverlaysMergeX64' Language='0' DiskId='1'   SourceFile='$(var.TOverlaysSrcDir)\$(var.TOverlaysSrcFilenameX64)' /> - <!-- TortoiseOverlaysMergeX64 is merge-incompatible with TortoiseOverlaysMergeX86 due to conflicting - component id's. So we cannot merge both, but ideally, we would - (see http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2446062) -->   <Directory Id="CommonFiles64Folder" Name="Programs64" >   <Directory Id="Common64" Name="TortoiseHg" >   <Component Id='thgshellx64dll' Guid='59FD2A49-BA62-40CC-B155-D11DB11EE611' Win64='yes'> @@ -249,7 +245,7 @@
  <ComponentRef Id='thgshellx64dll' />   <Feature Id='ShellExtensionx86' Title='Shell Extension x86' Level='1' AllowAdvertise='no'   Description='Overlay icons and context menu for 32 bit processes'> - <!-- <MergeRef Id='TortoiseOverlaysMergeX86' /> --> + <MergeRef Id='TortoiseOverlaysMergeX86' />   <ComponentRef Id='thgshellx86dll' />   </Feature>   </Feature>