Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.1, 1.9.2, and 1.9.3

wix: add an ssl certificate file to Windows installers

Changeset 9cc5ea6e39e6…

Parent 8a857b904cf0…

by Steve Borho

Changes to 2 files · Browse files at 9cc5ea6e39e6 Showing diff from parent 8a857b904cf0 Diff from another changeset...

Change 1 of 1 Show Entire File win32/​wix/​guids.wxi Stacked
 
79
80
81
 
 
82
83
84
 
79
80
81
82
83
84
85
86
@@ -79,6 +79,8 @@
  <?define mercurial.rc.guid = {97EC54BA-02F7-40CD-B876-0572AF7D894B} ?>   <?define mergetools.rc.guid = {EA7F7766-FC75-489F-91AE-3B16E5FE936E} ?>   <?define mergepatterns.rc.guid = {3372ED83-BCE1-4AD3-B5EA-65158C715B54} ?> + <?define paths.rc.guid = {2D94117B-32EC-4507-8E77-AF9D5BC5EA87} ?> + <?define cacert.pem.guid = {37D0A0FC-817D-4DD0-8A07-3841E13092E6} ?>     <?define ProgramMenuDir.guid = {77EDD1A4-FF9A-41CB-83D7-8141D67F0367} ?>   <?define ThgAppData.guid = {4264E496-A992-48E7-92EB-A3BF21E71E41} ?>
Change 1 of 2 Show Entire File win32/​wix/​tortoisehg.wxs Stacked
 
272
273
274
 
 
 
 
 
 
 
 
 
275
276
277
 
359
360
361
 
 
362
363
364
 
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
 
368
369
370
371
372
373
374
375
@@ -272,6 +272,15 @@
  Source='win32\mergepatterns.rc'   />   </Component> + <Component Id='paths.rc' Guid='$(var.paths.rc.guid)' Win64='$(var.IsX64)'> + <CreateFolder/> + <IniFile Id="ini0" Action="createLine" Directory="HGRCD" Name="Paths.rc" + Section="web" Key="cacerts" Value="[INSTALLDIR]hgrc.d\cacert.pem" /> + </Component> + <Component Id='cacert.pem' Guid='$(var.cacert.pem.guid)' Win64='$(var.IsX64)'> + <File Id='cacert.pem' Name='cacert.pem' Source='..\misc\cacert.pem' + ReadOnly='yes' KeyPath='yes'/> + </Component>   </Directory>   </Directory>   </Directory> @@ -359,6 +368,8 @@
  <ComponentRef Id='COPYING' />   <ComponentRef Id='mercurial.rc' />   <ComponentRef Id='mergetools.rc' /> + <ComponentRef Id='paths.rc' /> + <ComponentRef Id='cacert.pem' />   <ComponentRef Id='ExtensionVersions' />   <ComponentRef Id='helpFolder' />   <ComponentRef Id='distOutput' />