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: move TOverlays defines to begin of tortoisehg.wxs

Changeset 2e9685189671…

Parent ba9821a11ee6…

by Adrian Buehlmann

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

Change 1 of 2 Show Entire File contrib/​wix/​tortoisehg.wxs Stacked
 
8
9
10
 
11
12
13
14
15
16
 
 
 
 
 
17
18
19
 
173
174
175
176
177
178
179
180
181
182
183
 
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
 
179
180
181
 
 
 
 
 
182
183
184
@@ -8,12 +8,18 @@
    <?define ComponentMainExecutableGUID = 5A98EB92-2C82-406E-81A5-1161CA87ED8E ?>   <?define ProductUpgradeCode = 838657CF-C9EC-452D-800D-0E70FC021D0A ?> +   <?if $(var.Platform) = "x64" ?>   <?define IsX64 = yes ?>   <?else?>   <?define IsX64 = no ?>   <?endif?>   + <?define TOverlaysVersion = 1.0.13.18745 ?> + <?define TOverlaysSrcDir = ..\contrib\TortoiseOverlays ?> + <?define TOverlaysSrcFilenameX86 = TortoiseOverlays-$(var.TOverlaysVersion)-win32.msm ?> + <?define TOverlaysSrcFilenameX64 = TortoiseOverlays-$(var.TOverlaysVersion)-x64.msm ?> +   <Product Name='TortoiseHg $(var.Version)' Id='$(var.ProductId)' UpgradeCode='$(var.ProductUpgradeCode)'   Language='1033' Codepage='1252' Version='$(var.Version)' Manufacturer='Steve Borho and others.'>   @@ -173,11 +179,6 @@
  </Directory>   </Directory -->   - <?define TOverlaysVersion = 1.0.13.18745 ?> - <?define TOverlaysSrcDir = ..\contrib\TortoiseOverlays ?> - <?define TOverlaysSrcFilenameX86 = TortoiseOverlays-$(var.TOverlaysVersion)-win32.msm ?> - <?define TOverlaysSrcFilenameX64 = TortoiseOverlays-$(var.TOverlaysVersion)-x64.msm ?> -   <Merge Id='VCRedist' DiskId='1' Language='1033'   SourceFile='C:\Program Files\Microsoft SDKs\Windows\v7.0\Redist\VC\microsoft.vcxx.crt.x86_msm.msm' />   <Merge Id='VCRedistPolicy' DiskId='1' Language='1033'