support define_macros / undef_macros in setup.cfg

Tools/msi/msi.py

 # Python MSI Generator
 # (C) 2003 Martin v. Loewis
 # See "FOO" in comments refers to MSDN sections with the title FOO.
 import msilib, schema, sequence, os, glob, time, re, shutil, zipfile
 import subprocess, tempfile
 from msilib import Feature, CAB, Directory, Dialog, Binary, add_data
 import uisample
 from win32com.client import constants
 from distutils.spawn import find_executable
 
@@ skipping 857 matching lines @@
     prepend_path = Feature(db, "PrependPath", "Add python.exe to Path",
                         "Prepend [TARGETDIR] to the system Path variable. "
                         "This allows you to type 'python' into a command "
                         "prompt without needing the full path.", 13,
                         parent = default_feature, attributes=2|8,
                         level=2)
 
 def extract_msvcr100():
     # Find the redistributable files
     if msilib.Win64:
-        arch = "x64"
+        arch = "amd64"
     else:
         arch = "x86"
     dir = os.path.join(os.environ['VS100COMNTOOLS'], r"..\..\VC\redist\%s\Microsoft.VC100.CRT" % arch)
 
     result = []
     installer = msilib.MakeInstaller()
     # At least for VS2010, manifests are no longer provided
     name = "msvcr100.dll"
     path = os.path.join(dir, name)
     kw = {'src':path}
@@ skipping 226 matching lines @@
         lib.glob("*.txt")
         if f == "pynche":
             x = PyDirectory(db, cab, lib, "X", "X", "X|X")
             x.glob("*.txt")
         if os.path.exists(os.path.join(lib.absolute, "README")):
             lib.add_file("README.txt", src="README")
         if f == 'Scripts':
             lib.add_file("2to3.py", src="2to3")
             lib.add_file("pydoc3.py", src="pydoc3")
             lib.add_file("pysetup3.py", src="pysetup3")
-            lib.add_file("pyvenv.py", src="pyvenv")
             if have_tcl:
                 lib.start_component("pydocgui.pyw", tcltk, keyfile="pydocgui.pyw")
                 lib.add_file("pydocgui.pyw")
     # Add documentation
     htmlfiles.set_current()
     lib = PyDirectory(db, cab, root, "Doc", "Doc", "DOC|Doc")
     lib.start_component("documentation", keyfile=docfile)
     lib.add_file(docfile, src="build/htmlhelp/"+docfile)
 
     cab.commit(db)
@@ skipping 242 matching lines @@
 
 merge(msiname, "SharedCRT", "TARGETDIR", modules)
 
 # certname (from config.py) should be (a substring of)
 # the certificate subject, e.g. "Python Software Foundation"
 if certname:
     os.system('signtool sign /n "%s" /t http://timestamp.verisign.com/scripts/timestamp.dll %s' % (certname, msiname))
 
 if pdbzip:
     build_pdbzip()