Bundle python dll in win32 installer if present
authorPascal Quantin <pascal.quantin@gmail.com>
Sun, 25 Jan 2009 21:08:36 +0100
changeset 8057 2a4cb1d509ec
parent 8056 f614f11a96ca
child 8058 a0555ae394b3
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.
contrib/win32/mercurial.iss
--- a/contrib/win32/mercurial.iss	Sun Jan 25 21:55:18 2009 +0100
+++ b/contrib/win32/mercurial.iss	Sun Jan 25 21:08:36 2009 +0100
@@ -36,6 +36,7 @@
 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}