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

stable wix: define new var VCRedistSrcDir

Changeset b6ea5dbecda0…

Parent 2e9685189671…

by Adrian Buehlmann

Changes to one file · Browse files at b6ea5dbecda0 Showing diff from parent 2e9685189671 Diff from another changeset...

Change 1 of 2 Show Entire File contrib/​wix/​tortoisehg.wxs Stacked
 
20
21
22
 
 
23
24
25
 
180
181
182
183
 
184
185
 
186
187
188
 
20
21
22
23
24
25
26
27
 
182
183
184
 
185
186
 
187
188
189
190
@@ -20,6 +20,8 @@
  <?define TOverlaysSrcFilenameX86 = TortoiseOverlays-$(var.TOverlaysVersion)-win32.msm ?>   <?define TOverlaysSrcFilenameX64 = TortoiseOverlays-$(var.TOverlaysVersion)-x64.msm ?>   + <?define VCRedistSrcDir = C:\Program Files\Microsoft SDKs\Windows\v7.0\Redist\VC ?> +   <Product Name='TortoiseHg $(var.Version)' Id='$(var.ProductId)' UpgradeCode='$(var.ProductUpgradeCode)'   Language='1033' Codepage='1252' Version='$(var.Version)' Manufacturer='Steve Borho and others.'>   @@ -180,9 +182,9 @@
  </Directory -->     <Merge Id='VCRedist' DiskId='1' Language='1033' - SourceFile='C:\Program Files\Microsoft SDKs\Windows\v7.0\Redist\VC\microsoft.vcxx.crt.x86_msm.msm' /> + SourceFile='$(var.VCRedistSrcDir)\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' /> + SourceFile='$(var.VCRedistSrcDir)\policy.x.xx.microsoft.vcxx.crt.x86_msm.msm' />   <Merge Id='TortoiseOverlaysMergeX86' Language='0' DiskId='1'   SourceFile='$(var.TOverlaysSrcDir)\$(var.TOverlaysSrcFilenameX86)' />   <?if $(var.Platform) = "x64" ?>