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

wix: move guids from icons.wxs to thg-guids.wxi

Changeset b767a0af0e0c…

Parent 5889b25f5887…

by Adrian Buehlmann

Changes to 2 files · Browse files at b767a0af0e0c Showing diff from parent 5889b25f5887 Diff from another changeset...

Change 1 of 2 Show Entire File contrib/​wix/​icons.wxs Stacked
 
1
2
3
 
 
4
5
6
7
8
9
 
10
11
12
 
52
53
54
55
 
56
57
58
 
1
2
3
4
5
6
7
8
9
10
 
11
12
13
14
 
54
55
56
 
57
58
59
60
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">   + <?include thg-guids.wxi ?> +   <Fragment>   <DirectoryRef Id="INSTALLDIR">     <Directory Id="IconsDirectory" Name="icons">   - <Component Id='Icons' Guid='{30E997E7-FB02-4d34-AF61-A6FD6C93E268}'> + <Component Id='Icons' Guid='$(var.Icons.guid)'>   <File Source="$(var.SourceDir)\branch.ico" KeyPath="yes" />   <File Source="$(var.SourceDir)\detect_rename.ico" />   <File Source="$(var.SourceDir)\fileadd.ico" /> @@ -52,7 +54,7 @@
  </Component>     <Directory Id="SvgDirectory" Name="svg"> - <Component Id='SvgIcons' Guid='{7C87CCC7-8377-49c8-ACFD-1F246ED14747}'> + <Component Id='SvgIcons' Guid='$(var.SvgIcons.guid)'>   <File Source="$(var.SourceDir)\svg\add.svg" KeyPath="yes" />   <File Source="$(var.SourceDir)\svg\checkout.svg" />   <File Source="$(var.SourceDir)\svg\clone.svg" />
Change 1 of 1 Show Entire File contrib/​wix/​thg-guids.wxi Stacked
 
3
4
5
 
 
 
 
6
7
8
 
3
4
5
6
7
8
9
10
11
12
@@ -3,6 +3,10 @@
  <!-- cmenu-i18n.wxs -->   <?define cmenuI18n.guid = {B0AB4947-248C-4c6b-841C-49284EF99022} ?>   + <!-- icons.wxs --> + <?define Icons.guid = {30E997E7-FB02-4d34-AF61-A6FD6C93E268} ?> + <?define SvgIcons.guid = {7C87CCC7-8377-49c8-ACFD-1F246ED14747} ?> +   <!-- thg-i18n.wxs -->   <?define thgI18nFolder.guid = {69E6E182-BCD2-4b03-A941-7B9A054DF7AF} ?>