Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset f54b13e0a794…

Parents bee1c3a2ce67…

Parents b6ea5dbecda0…

by Yuki KODAMA

Changes to 2 files · Browse files at f54b13e0a794 Showing diff from parent bee1c3a2ce67 b6ea5dbecda0 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
184
 
185
186
187
 
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
 
181
182
183
 
 
 
 
 
184
 
185
186
 
187
188
189
190
@@ -8,12 +8,20 @@
    <?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 ?> + + <?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.'>   @@ -173,15 +181,10 @@
  </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' /> + 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" ?>
Change 1 of 2 Show Entire File doc/​source/​debugging.txt Stacked
 
30
31
32
33
 
34
35
36
 
39
40
41
42
 
43
44
45
 
30
31
32
 
33
34
35
36
 
39
40
41
 
42
43
44
45
@@ -30,7 +30,7 @@
 into a :command:`cmd.exe` window, while inside the repository::     set THGDEBUG=1 - hgtk log + hgtk --nofork log    Linux/MacOSX  ~~~~~~~~~~~~ @@ -39,7 +39,7 @@
 into your shell window, while inside the repository::     export THGDEBUG=1 - hgtk log + hgtk --nofork log