[PATCH 1 of 3] Bundle python dll in win32 installer if present

Pascal Quantin pascal.quantin at gmail.com
Sun Jan 25 15:15:05 CST 2009


# HG changeset patch
# User Pascal Quantin <pascal.quantin at gmail.com>
# Date 1232914116 -3600
# Node ID 36146ebfedcdb6a00375f5faa47e5e4f8fc9db14
# Parent  9f9bbd33f71e051b636d4b7d7baedbdf855e84f8
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 isntaller 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\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}


More information about the Mercurial-devel mailing list