[PATCH 2 of 4] Bundle i18n files in win32 installer

Pascal Quantin pascal.quantin at gmail.com
Sun Jan 25 16:33:57 CST 2009


# HG changeset patch
# User Pascal Quantin <pascal.quantin at gmail.com>
# Date 1232916660 -3600
# Node ID f0de92dd859fa8b8c451a9898d91b8cc38835974
# Parent  91e767faec3d40ce5e35061bc2ff672b4c1499ff
Bundle i18n files in win32 installer

Include i18n and locale folders in installer. By default take all content of dist/mercurial directory: it will allow to package all future directories without needing to modify Inno Setup script.
Also lowercase other directories names to be consistent with dist/mercurial content

diff --git a/contrib/win32/mercurial.ini b/contrib/win32/mercurial.ini
--- a/contrib/win32/mercurial.ini
+++ b/contrib/win32/mercurial.ini
@@ -48,6 +48,6 @@
 [hgk]
 ; Replace the following with your path to hgk, uncomment it and 
 ; install ActiveTcl (or another win32 port)
-; path="C:\Program Files\Mercurial\Contrib\hgk.tcl"
+; path="C:\Program Files\Mercurial\contrib\hgk.tcl"
 
 
diff --git a/contrib/win32/mercurial.iss b/contrib/win32/mercurial.iss
--- a/contrib/win32/mercurial.iss
+++ b/contrib/win32/mercurial.iss
@@ -27,10 +27,10 @@
 PrivilegesRequired=none
 
 [Files]
-Source: contrib\mercurial.el; DestDir: {app}/Contrib
-Source: contrib\vim\*.*; DestDir: {app}/Contrib/Vim
-Source: contrib\zsh_completion; DestDir: {app}/Contrib
-Source: contrib\hgk; DestDir: {app}/Contrib; DestName: hgk.tcl
+Source: contrib\mercurial.el; DestDir: {app}/contrib
+Source: contrib\vim\*.*; DestDir: {app}/contrib/vim
+Source: contrib\zsh_completion; DestDir: {app}/contrib
+Source: contrib\hgk; DestDir: {app}/contrib; DestName: hgk.tcl
 Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme
 Source: contrib\mergetools.hgrc; DestDir: {tmp};
 Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; Check: CheckFile; AfterInstall: ConcatenateFiles;
@@ -42,8 +42,8 @@
 Source: dist\msvcr71.dll; DestDir: {app}
 Source: dist\w9xpopen.exe; DestDir: {app}
 Source: dist\add_path.exe; DestDir: {app}
-Source: doc\*.html; DestDir: {app}\Docs
-Source: templates\*.*; DestDir: {app}\Templates; Flags: recursesubdirs createallsubdirs
+Source: doc\*.html; DestDir: {app}\docs
+Source: dist\mercurial\*.*; DestDir: {app}; Flags: recursesubdirs createallsubdirs
 Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt
 Source: COPYING; DestDir: {app}; DestName: Copying.txt
 
@@ -55,7 +55,7 @@
 
 [Icons]
 Name: {group}\Uninstall Mercurial; Filename: {uninstallexe}
-Name: {group}\Mercurial Command Reference; Filename: {app}\Docs\hg.1.html
+Name: {group}\Mercurial Command Reference; Filename: {app}\docs\hg.1.html
 Name: {group}\Mercurial Web Site; Filename: {app}\Mercurial.url
 
 [Run]


More information about the Mercurial-devel mailing list