diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2012-02-21 17:07:58 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2012-02-21 17:07:58 (GMT) |
| commit | dc4170c5bce49cdfacb7aa6e61b573bf39a87673 (patch) | |
| tree | 0b978d9af1b9b34d151ca16a51c1a1fbe819ceea | |
| parent | f9caee9ab435d53a920ba9239e9a8fe4fe58976f (diff) | |
| parent | dbd3f6173a0dd15c97b60be56cc37ff1cf5487e5 (diff) | |
| download | cpython-dc4170c5bce49cdfacb7aa6e61b573bf39a87673.zip cpython-dc4170c5bce49cdfacb7aa6e61b573bf39a87673.tar.gz cpython-dc4170c5bce49cdfacb7aa6e61b573bf39a87673.tar.bz2 | |
merge 2.6
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Tools/msi/msi.py | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -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. diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 3cdb758..5911773 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -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: |