mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-12-15 12:54:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge 2.6

Browse Source
This commit is contained in:
Martin v. Löwis 2012-02-21 18:07:58 +01:00
commit dc4170c5bc
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -1942,6 +1942,8 @@ Library
Build
-----
- Issue #6807: Run msisupport.mak earlier.
- Issue #10580: Minor grammar change in Windows installer.
- Issue #13326: Clean __pycache__ directories correctly on OpenBSD.

4
Tools/msi/msi.py
View File

@ -180,6 +180,8 @@ mingw_lib = os.path.join(srcdir, PCBUILD, "libpython%s%s.a" % (major, minor))
have_mingw = build_mingw_lib(lib_file, def_file, dll_file, mingw_lib)
# Determine the target architecture
if os.system("nmake /nologo /c /f msisupport.mak") != 0:
raise RuntimeError("'nmake /f msisupport.mak' failed")
dll_path = os.path.join(srcdir, PCBUILD, dll_file)
msilib.set_arch_from_file(dll_path)
if msilib.pe_type(dll_path) != msilib.pe_type("msisupport.dll"):
@ -377,8 +379,6 @@ def add_ui(db):
# UpdateEditIDLE sets the REGISTRY.tcl component into
# the installed/uninstalled state according to both the
# Extensions and TclTk features.
if os.system("nmake /nologo /c /f msisupport.mak") != 0:
raise RuntimeError("'nmake /f msisupport.mak' failed")
add_data(db, "Binary", [("Script", msilib.Binary("msisupport.dll"))])
# See "Custom Action Type 1"
if msilib.Win64: