diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2012-02-21 17:06:22 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2012-02-21 17:06:22 (GMT) |
| commit | dbd3f6173a0dd15c97b60be56cc37ff1cf5487e5 (patch) | |
| tree | 5a66ad0a265a5ebb1055059160191c829b48baae /Tools/msi | |
| parent | 26bb3cf7cdf4052fd3cad3c435b1e00990e78db4 (diff) | |
| download | cpython-dbd3f6173a0dd15c97b60be56cc37ff1cf5487e5.zip cpython-dbd3f6173a0dd15c97b60be56cc37ff1cf5487e5.tar.gz cpython-dbd3f6173a0dd15c97b60be56cc37ff1cf5487e5.tar.bz2 | |
Issue #6807: Run msisupport.mak earlier.
Diffstat (limited to 'Tools/msi')
| -rw-r--r-- | Tools/msi/msi.py | 4 |
1 files changed, 2 insertions, 2 deletions
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: |