Show More
@@ -44,8 +44,6 b'' | |||||
44 | <?define COPYING.guid = {B7801DBA-1C49-4BF4-91AD-33C65F5C7895} ?> |
|
44 | <?define COPYING.guid = {B7801DBA-1C49-4BF4-91AD-33C65F5C7895} ?> | |
45 | <?define mercurial.rc.guid = {1D5FAEEE-7E6E-43B1-9F7F-802714316B15} ?> |
|
45 | <?define mercurial.rc.guid = {1D5FAEEE-7E6E-43B1-9F7F-802714316B15} ?> | |
46 | <?define mergetools.rc.guid = {E8A1DC29-FF40-4B5F-BD12-80B9F7BF0CCD} ?> |
|
46 | <?define mergetools.rc.guid = {E8A1DC29-FF40-4B5F-BD12-80B9F7BF0CCD} ?> | |
47 | <?define paths.rc.guid = {F9ADF21D-5F0B-4934-8CD9-14BE63664721} ?> |
|
|||
48 | <?define cacert.pem.guid = {EC1B2630-FE21-46E6-915B-A6545AF703D4} ?> |
|
|||
49 | <?define ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?> |
|
47 | <?define ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?> | |
50 |
|
48 | |||
51 | </Include> |
|
49 | </Include> |
@@ -82,15 +82,6 b'' | |||||
82 | <File Id='mergetools.rc' Name='MergeTools.rc' Source='mercurial\default.d\mergetools.rc' |
|
82 | <File Id='mergetools.rc' Name='MergeTools.rc' Source='mercurial\default.d\mergetools.rc' | |
83 | ReadOnly='yes' KeyPath='yes'/> |
|
83 | ReadOnly='yes' KeyPath='yes'/> | |
84 | </Component> |
|
84 | </Component> | |
85 | <Component Id='paths.rc' Guid='$(var.paths.rc.guid)' Win64='$(var.IsX64)'> |
|
|||
86 | <CreateFolder/> |
|
|||
87 | <IniFile Id="ini0" Action="createLine" Directory="HGRCD" Name="Paths.rc" |
|
|||
88 | Section="web" Key="cacerts" Value="[INSTALLDIR]hgrc.d\cacert.pem" /> |
|
|||
89 | </Component> |
|
|||
90 | <Component Id='cacert.pem' Guid='$(var.cacert.pem.guid)' Win64='$(var.IsX64)'> |
|
|||
91 | <File Id='cacert.pem' Name='cacert.pem' Source='..\misc\cacert.pem' |
|
|||
92 | ReadOnly='yes' KeyPath='yes'/> |
|
|||
93 | </Component> |
|
|||
94 | </Directory> |
|
85 | </Directory> | |
95 |
|
86 | |||
96 | </Directory> |
|
87 | </Directory> | |
@@ -132,8 +123,6 b'' | |||||
132 | <ComponentRef Id='COPYING' /> |
|
123 | <ComponentRef Id='COPYING' /> | |
133 | <ComponentRef Id='mercurial.rc' /> |
|
124 | <ComponentRef Id='mercurial.rc' /> | |
134 | <ComponentRef Id='mergetools.rc' /> |
|
125 | <ComponentRef Id='mergetools.rc' /> | |
135 | <ComponentRef Id='paths.rc' /> |
|
|||
136 | <ComponentRef Id='cacert.pem' /> |
|
|||
137 | <ComponentRef Id='helpFolder' /> |
|
126 | <ComponentRef Id='helpFolder' /> | |
138 | <ComponentGroupRef Id='templatesFolder' /> |
|
127 | <ComponentGroupRef Id='templatesFolder' /> | |
139 | <MergeRef Id='VCRuntime' /> |
|
128 | <MergeRef Id='VCRuntime' /> |
General Comments 0
You need to be logged in to leave comments.
Login now