diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2012-02-21 18:12:02 +0100 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2012-02-21 18:12:02 +0100 |
| commit | a1b2af8034e1da367778de18872f7a1cddcc524e (patch) | |
| tree | 7790b8110fc7c525aed8b8f438518770893db835 | |
| parent | 9d7601fcea7c9cee6132c4a4dffb482cfa351785 (diff) | |
| download | cpython-git-a1b2af8034e1da367778de18872f7a1cddcc524e.tar.gz | |
Issue #6807: Run msisupport.mak earlier.
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Tools/msi/msi.py | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -517,6 +517,8 @@ Extension Modules Build ----- +- Issue #6807: Run msisupport.mak earlier. + - Issue #10580: Minor grammar change in Windows installer. - Issue #12627: Implement PEP 394 for Python 2.7 ("python2"). diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 5475bd0f60..d2caf345b1 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -177,6 +177,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"): @@ -374,8 +376,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 "'nmake /f msisupport.mak' failed" add_data(db, "Binary", [("Script", msilib.Binary("msisupport.dll"))]) # See "Custom Action Type 1" if msilib.Win64: |