Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.3, 2.0.4, and 2.0.5

stable wix: add libsasl.dll to x86 installer (refs #229)

Changeset 0a707be45e60…

Parent af91921e988b…

by Steve Borho

Changes to 2 files · Browse files at 0a707be45e60 Showing diff from parent af91921e988b Diff from another changeset...

Change 1 of 1 Show Changes Only win32/​wix/​dist.wxs Stacked
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
 
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
 <?xml version="1.0" encoding="utf-8"?>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">     <?include guids.wxi ?>   <?include defines.wxi ?>     <Fragment>   <DirectoryRef Id="INSTALLDIR" FileSource="$(var.SourceDir)">   <Component Id="distOutput" Guid="$(var.dist.guid)" Win64='$(var.IsX64)'>   <File Name="library.zip" KeyPath="yes" />   <File Name="hg.exe" />   <File Name="mercurial.base85.pyd" />   <File Name="mercurial.bdiff.pyd" />   <File Name="mercurial.diffhelpers.pyd" />   <File Name="mercurial.mpatch.pyd" />   <File Name="mercurial.osutil.pyd" />   <File Name="mercurial.parsers.pyd" />   <File Name="pyexpat.pyd" />   <File Name="PyQt4.Qsci.pyd" />   <File Name="PyQt4.QtCore.pyd" />   <File Name="PyQt4.QtGui.pyd" />   <File Name="PyQt4.QtNetwork.pyd" />   <File Name="python26.dll" />   <File Name="pythoncom26.dll" />   <File Name="pywintypes26.dll" />   <File Name="QtCore4.dll" />   <File Name="QtGui4.dll" />   <File Name="QtNetwork4.dll" />   <File Name="QtSvg4.dll" />   <File Name="QtXml4.dll" />   <File Name="qscintilla2.dll" />   <File Name="bz2.pyd" />   <File Name="dulwich._objects.pyd" />   <File Name="dulwich._pack.pyd" />   <File Name="libsvn._client.pyd" />   <File Name="libsvn._core.pyd" />   <File Name="libsvn._delta.pyd" />   <File Name="libsvn._ra.pyd" />   <File Name="libsvn._wc.pyd" />   <File Name="SSLEAY32.dll" />   <File Name="LIBEAY32.dll" />   <File Name="libapr-1.dll" />   <File Name="libapriconv-1.dll" />   <File Name="libaprutil-1.dll" />   <File Name="libsvn_client-1.dll" />   <File Name="libsvn_delta-1.dll" />   <File Name="libsvn_diff-1.dll" />   <File Name="libsvn_fs-1.dll" />   <File Name="libsvn_ra-1.dll" />   <File Name="libsvn_repos-1.dll" />   <File Name="libsvn_subr-1.dll" />   <File Name="libsvn_wc-1.dll" />   <File Name="libsvn_swig_py-1.dll" />   <?if $(var.Platform) = "x86" ?>   <File Name="intl3_svn.dll" />   <File Name="libdb44.dll" /> + <File Name="libsasl.dll" />   <?endif?>   <File Name="select.pyd" />   <File Name="sip.pyd" />   <File Name="unicodedata.pyd" />   <File Name="win32api.pyd" />   <File Name="win32com.shell.shell.pyd" />   <File Name="win32_crypto.pyd" />   <File Name="win32cred.pyd" />   <File Name="win32event.pyd" />   <File Name="win32file.pyd" />   <File Name="win32gui.pyd" />   <File Name="win32net.pyd" />   <File Name="win32pipe.pyd" />   <File Name="win32process.pyd" />   <File Name="win32security.pyd" />   <File Name="win32trace.pyd" />   <File Name="_ctypes.pyd" />   <File Name="_ctypes_test.pyd" />   <File Name="_elementtree.pyd" />   <File Name="_hashlib.pyd" />   <File Name="_socket.pyd" />   <File Name="_ssl.pyd" />   <File Name="_win32sysloader.pyd" />   </Component>   </DirectoryRef>   </Fragment>     <Fragment>   <DirectoryRef Id="INSTALLDIR">   <Directory Id="imgFmtDir" Name="imageformats" FileSource="$(var.SourceDir)/imageformats">   <Component Id="imageFormats" Guid="$(var.imageformats.guid)" Win64='$(var.IsX64)'>   <File Name="qico4.dll" KeyPath="yes" />   <File Name="qsvg4.dll" />   </Component>   </Directory>   </DirectoryRef>   </Fragment>    </Wix>
Change 1 of 1 Show Entire File win32/​wix/​guids.wxi Stacked
 
33
34
35
36
 
37
38
39
 
33
34
35
 
36
37
38
39
@@ -33,7 +33,7 @@
  <?define templates.static.guid = {ECF8D1EF-910D-4586-9508-86A6236B4FD5} ?>     <!-- dist.wxs --> - <?define dist.guid = {9287B4BD-AA5A-43CA-8BB2-BAAAFB1BC283} ?> + <?define dist.guid = {9A429564-6BA8-4F18-ACCF-59C586364FFC} ?>   <?define imageformats.guid = {056DFB00-3EB1-4ACA-A43B-55CD5004DED1} ?>     <!-- cmenu-i18n.wxs -->