# HG changeset patch
# User Pascal Quantin <pascal.quantin@gmail.com>
# Date 2009-01-25 20:08:36
# Node ID 2a4cb1d509ec33253270d68e31d3042701e637d7
# Parent  f614f11a96cad3e288789d7dc006b7e0e83cbce3

Bundle python dll in win32 installer if present

in case hg.exe is generated with the py2exe '-b 2' option instead of '-b 1',
python2?.dll is not included in library.zip file and must also be packaged.
The file will be integrated in the installer only if it is present in the dist
directory.  Generating hg.exe with the '-b 2' option is mandatory to avoid a
crash when pyreadline is installed.

diff --git a/contrib/win32/mercurial.iss b/contrib/win32/mercurial.iss
--- a/contrib/win32/mercurial.iss
+++ b/contrib/win32/mercurial.iss
@@ -36,6 +36,7 @@ Source: contrib\mergetools.hgrc; DestDir
 Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; Check: CheckFile; AfterInstall: ConcatenateFiles;
 Source: contrib\win32\postinstall.txt; DestDir: {app}; DestName: ReleaseNotes.txt
 Source: dist\hg.exe; DestDir: {app}; AfterInstall: Touch('{app}\hg.exe.local')
+Source: dist\python*.dll; Destdir: {app}; Flags: skipifsourcedoesntexist
 Source: dist\library.zip; DestDir: {app}
 Source: dist\mfc71.dll; DestDir: {app}
 Source: dist\msvcr71.dll; DestDir: {app}