win32: fix win32 installers generation
cd0c51c07e5f introduced a typo preventing a proper generation of the
installers. Also remove ConcatenateFiles() function as it is no more
required.
--- a/contrib/win32/mercurial.iss Tue Nov 04 13:38:33 2014 +0000
+++ b/contrib/win32/mercurial.iss Tue Nov 04 21:35:49 2014 +0100
@@ -67,7 +67,7 @@
Source: contrib\hgweb.fcgi; DestDir: {app}/Contrib
Source: contrib\hgweb.wsgi; DestDir: {app}/Contrib
Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme
-Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; Check: CheckFile; AfterInstall: ConcatenateFiles;
+Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; Check: CheckFile;
Source: contrib\win32\postinstall.txt; DestDir: {app}; DestName: ReleaseNotes.txt
Source: dist\hg.exe; DestDir: {app}; AfterInstall: Touch('{app}\hg.exe.local')
#if ARCH == "x64"
@@ -85,7 +85,7 @@
Source: doc\*.html; DestDir: {app}\Docs
Source: doc\style.css; DestDir: {app}\Docs
Source: mercurial\help\*.txt; DestDir: {app}\help
-Source: mercurial\default-hgrc.d\*.rc; DestDir: {app}\default-hgrc.d
+Source: mercurial\default.d\*.rc; DestDir: {app}\default.d
Source: mercurial\locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs skipifsourcedoesntexist
Source: mercurial\templates\*.*; DestDir: {app}\Templates; Flags: recursesubdirs createallsubdirs
Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt
@@ -131,15 +131,6 @@
Result := WriteFile;
end;
-procedure ConcatenateFiles();
-var
- MergeConfigs: TArrayOfString;
-begin
- if LoadStringsFromFile(ExpandConstant('{tmp}\mergetools.hgrc'),MergeConfigs) then begin
- SaveStringsToFile(ExpandConstant(CurrentFileName),MergeConfigs,True);
- end;
-end;
-
procedure Touch(fn: String);
begin
SaveStringToFile(ExpandConstant(fn), '', False);
--- a/contrib/wix/mercurial.wxs Tue Nov 04 13:38:33 2014 +0000
+++ b/contrib/wix/mercurial.wxs Tue Nov 04 21:35:49 2014 +0100
@@ -79,7 +79,7 @@
ReadOnly='yes' KeyPath='yes'/>
</Component>
<Component Id='mergetools.rc' Guid='$(var.mergetools.rc.guid)' Win64='$(var.IsX64)'>
- <File Id='mergetools.rc' Name='MergeTools.rc' Source='mercurial\default-hgrc.d\mergetools.rc'
+ <File Id='mergetools.rc' Name='MergeTools.rc' Source='mercurial\default.d\mergetools.rc'
ReadOnly='yes' KeyPath='yes'/>
</Component>
<Component Id='paths.rc' Guid='$(var.paths.rc.guid)' Win64='$(var.IsX64)'>