Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph

Merge with stable

Changeset 03bb75578432…

Parents 9ee9777f282c…

Parents d0a2a07a7aa0…

by Adrian Buehlmann

Changes to one file · Browse files at 03bb75578432 Showing diff from parent 9ee9777f282c d0a2a07a7aa0 Diff from another changeset...

Change 1 of 4 Show Entire File win32/​wix/​tortoisehg.wxs Stacked
 
16
17
18
 
19
20
21
22
23
 
24
25
26
 
146
147
148
149
 
150
151
152
153
 
154
155
156
 
178
179
180
181
 
182
183
184
185
 
186
187
188
 
326
327
328
329
 
330
331
332
333
 
334
335
336
 
16
17
18
19
20
21
22
23
 
24
25
26
27
 
147
148
149
 
150
151
152
153
 
154
155
156
157
 
179
180
181
 
182
183
184
185
 
186
187
188
189
 
327
328
329
 
330
331
332
333
 
334
335
336
337
@@ -16,11 +16,12 @@
  <?endif?>     <?define ProgramRegKey = Software\TortoiseHg ?> + <?define ShellextRepoFolder = ../../../build-shellext ?>     <?include TortoiseOverlaysDefines.wxi ?>     <!-- shell extension CLSID's --> - <?include ../../../build-shellext/src/ThgCLSIDs.wxi ?> + <?include $(var.ShellextRepoFolder)/src/ThgCLSIDs.wxi ?>     <Product Name='TortoiseHg $(var.Version) ($(var.Platform))'   Id='$(var.ProductId)' @@ -146,11 +147,11 @@
  </Component>   <Component Id='CmenuShellRegistrationX64' Win64='yes'   Guid='$(var.CmenuShellRegistrationX64.guid)'> - <?include ../../../build-shellext/wix/shell-register-cmenu.wxi ?> + <?include $(var.ShellextRepoFolder)/wix/shell-register-cmenu.wxi ?>   </Component>   <Component Id='OverlaysShellRegistrationX64' Win64='yes'   Guid='$(var.OverlaysShellRegistrationX64.guid)'> - <?include ../../../build-shellext/wix/shell-register-overlays.wxi ?> + <?include $(var.ShellextRepoFolder)/wix/shell-register-overlays.wxi ?>   </Component>   <?else?>   <Component Id='thgshellx86dll' Guid='$(var.thgshellx86dll.guid)' Win64='no'> @@ -178,11 +179,11 @@
  </Component>   <Component Id='CmenuShellRegistrationX86'   Guid='$(var.CmenuShellRegistrationX86.guid)' Win64='no'> - <?include ../../../build-shellext/wix/shell-register-cmenu.wxi ?> + <?include $(var.ShellextRepoFolder)/wix/shell-register-cmenu.wxi ?>   </Component>   <Component Id='OverlaysShellRegistrationX86'   Guid='$(var.OverlaysShellRegistrationX86.guid)' Win64='no'> - <?include ../../../build-shellext/wix/shell-register-overlays.wxi ?> + <?include $(var.ShellextRepoFolder)/wix/shell-register-overlays.wxi ?>   </Component>   <?endif?>   @@ -326,11 +327,11 @@
  </Component>   <Component Id='CmenuShellRegistrationX86'   Guid='$(var.CmenuShellRegistrationX86.guid)' Win64='no'> - <?include ../../../build-shellext/wix/shell-register-cmenu.wxi ?> + <?include $(var.ShellextRepoFolder)/wix/shell-register-cmenu.wxi ?>   </Component>   <Component Id='OverlaysShellRegistrationX86'   Guid='$(var.OverlaysShellRegistrationX86.guid)' Win64='no'> - <?include ../../../build-shellext/wix/shell-register-overlays.wxi ?> + <?include $(var.ShellextRepoFolder)/wix/shell-register-overlays.wxi ?>   </Component>   </Directory>   </Directory>