Show More
@@ -67,7 +67,7 b' Source: contrib\\mq.el; DestDir: {app}/Co' | |||
|
67 | 67 | Source: contrib\hgweb.fcgi; DestDir: {app}/Contrib |
|
68 | 68 | Source: contrib\hgweb.wsgi; DestDir: {app}/Contrib |
|
69 | 69 | Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme |
|
70 |
Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; Check: CheckFile; |
|
|
70 | Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; Check: CheckFile; | |
|
71 | 71 | Source: contrib\win32\postinstall.txt; DestDir: {app}; DestName: ReleaseNotes.txt |
|
72 | 72 | Source: dist\hg.exe; DestDir: {app}; AfterInstall: Touch('{app}\hg.exe.local') |
|
73 | 73 | #if ARCH == "x64" |
@@ -85,7 +85,7 b' Source: dist\\cacert.pem; Destdir: {app}' | |||
|
85 | 85 | Source: doc\*.html; DestDir: {app}\Docs |
|
86 | 86 | Source: doc\style.css; DestDir: {app}\Docs |
|
87 | 87 | Source: mercurial\help\*.txt; DestDir: {app}\help |
|
88 |
Source: mercurial\default |
|
|
88 | Source: mercurial\default.d\*.rc; DestDir: {app}\default.d | |
|
89 | 89 | Source: mercurial\locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs skipifsourcedoesntexist |
|
90 | 90 | Source: mercurial\templates\*.*; DestDir: {app}\Templates; Flags: recursesubdirs createallsubdirs |
|
91 | 91 | Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt |
@@ -131,15 +131,6 b' begin' | |||
|
131 | 131 | Result := WriteFile; |
|
132 | 132 | end; |
|
133 | 133 | |
|
134 | procedure ConcatenateFiles(); | |
|
135 | var | |
|
136 | MergeConfigs: TArrayOfString; | |
|
137 | begin | |
|
138 | if LoadStringsFromFile(ExpandConstant('{tmp}\mergetools.hgrc'),MergeConfigs) then begin | |
|
139 | SaveStringsToFile(ExpandConstant(CurrentFileName),MergeConfigs,True); | |
|
140 | end; | |
|
141 | end; | |
|
142 | ||
|
143 | 134 | procedure Touch(fn: String); |
|
144 | 135 | begin |
|
145 | 136 | SaveStringToFile(ExpandConstant(fn), '', False); |
@@ -79,7 +79,7 b'' | |||
|
79 | 79 | ReadOnly='yes' KeyPath='yes'/> |
|
80 | 80 | </Component> |
|
81 | 81 | <Component Id='mergetools.rc' Guid='$(var.mergetools.rc.guid)' Win64='$(var.IsX64)'> |
|
82 |
<File Id='mergetools.rc' Name='MergeTools.rc' Source='mercurial\default |
|
|
82 | <File Id='mergetools.rc' Name='MergeTools.rc' Source='mercurial\default.d\mergetools.rc' | |
|
83 | 83 | ReadOnly='yes' KeyPath='yes'/> |
|
84 | 84 | </Component> |
|
85 | 85 | <Component Id='paths.rc' Guid='$(var.paths.rc.guid)' Win64='$(var.IsX64)'> |
General Comments 0
You need to be logged in to leave comments.
Login now