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: refactor: introduce local WiX define TOverlaysVersion

Changeset f2b9f25e4369…

Parent 74eac769438f…

by Adrian Buehlmann

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

Change 1 of 1 Show Entire File contrib/​wix/​tortoisehg.wxs Stacked
 
173
174
175
 
 
 
 
 
176
177
178
179
180
181
182
 
183
184
185
 
186
187
188
 
173
174
175
176
177
178
179
180
181
182
183
184
185
186
 
187
188
189
 
190
191
192
193
@@ -173,16 +173,21 @@
  </Directory>   </Directory -->   + <?define TOverlaysVersion = 1.0.11.18359 ?> + <?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'   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='..\contrib\TortoiseOverlays\TortoiseOverlays-1.0.11.18359-win32.msm' /> + SourceFile='$(var.TOverlaysSrcDir)\$(var.TOverlaysSrcFilenameX86)' />   <?elseif $(var.Platform) = "x64" ?>   <Merge Id='TortoiseOverlaysMergeX64' Language='0' DiskId='1' - SourceFile='..\contrib\TortoiseOverlays\TortoiseOverlays-1.0.11.18359-x64.msm' /> + 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) -->