From dbd3f6173a0dd15c97b60be56cc37ff1cf5487e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Tue, 21 Feb 2012 18:06:22 +0100 Subject: Issue #6807: Run msisupport.mak earlier. --- Misc/NEWS | 2 ++ Tools/msi/msi.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index f387dc7..f8081a9 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -474,6 +474,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. diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 57b5033..19cd7fb 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -179,6 +179,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"): @@ -376,8 +378,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: -- cgit v0.12