mirror of https://github.com/python/cpython.git
Issue #6807: Run msisupport.mak earlier.
This commit is contained in:
parent
26bb3cf7cd
commit
dbd3f6173a
|
@ -474,6 +474,8 @@ Library
|
||||||
Build
|
Build
|
||||||
-----
|
-----
|
||||||
|
|
||||||
|
- Issue #6807: Run msisupport.mak earlier.
|
||||||
|
|
||||||
- Issue #10580: Minor grammar change in Windows installer.
|
- Issue #10580: Minor grammar change in Windows installer.
|
||||||
|
|
||||||
- Issue #13326: Clean __pycache__ directories correctly on OpenBSD.
|
- Issue #13326: Clean __pycache__ directories correctly on OpenBSD.
|
||||||
|
|
|
@ -179,6 +179,8 @@ def build_mingw_lib(lib_file, def_file, dll_file, mingw_lib):
|
||||||
have_mingw = build_mingw_lib(lib_file, def_file, dll_file, mingw_lib)
|
have_mingw = build_mingw_lib(lib_file, def_file, dll_file, mingw_lib)
|
||||||
|
|
||||||
# Determine the target architecture
|
# 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)
|
dll_path = os.path.join(srcdir, PCBUILD, dll_file)
|
||||||
msilib.set_arch_from_file(dll_path)
|
msilib.set_arch_from_file(dll_path)
|
||||||
if msilib.pe_type(dll_path) != msilib.pe_type("msisupport.dll"):
|
if msilib.pe_type(dll_path) != msilib.pe_type("msisupport.dll"):
|
||||||
|
@ -376,8 +378,6 @@ def add_ui(db):
|
||||||
# UpdateEditIDLE sets the REGISTRY.tcl component into
|
# UpdateEditIDLE sets the REGISTRY.tcl component into
|
||||||
# the installed/uninstalled state according to both the
|
# the installed/uninstalled state according to both the
|
||||||
# Extensions and TclTk features.
|
# 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"))])
|
add_data(db, "Binary", [("Script", msilib.Binary("msisupport.dll"))])
|
||||||
# See "Custom Action Type 1"
|
# See "Custom Action Type 1"
|
||||||
if msilib.Win64:
|
if msilib.Win64:
|
||||||
|
|
Loading…
Reference in New Issue