Patch #1545507: Exclude ctypes package in Win64 MSI file.

diff --git a/Misc/NEWS b/Misc/NEWS
index 7dbf1663d39e7737fb6f351dc35474bfd70ae6f5..357ea52af69caba76bdddadba7ba1b13b7ba42d5 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -36,6 +36,8 @@ Documentation
 Build
 -----
 
+- Patch #1545507: Exclude ctypes package in Win64 MSI file.
+
 - Fix OpenSSL debug build process.
 
 

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 8a72eb93d06e27c5177078ec6b3a2755d3c44bb2..f06944f43069b65db3984e2b87cc27a908acca5b 100644 (file)
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -872,6 +872,12 @@ def add_files(db):
                     version=version, language=lang)
     tmpfiles.append("msvcr71.dll")
 
+    # Check if _ctypes.pyd exists
+    have_ctypes = os.path.exists(srcdir+"/PCBuild/_ctypes.pyd")
+    if not have_ctypes:
+        print "WARNING: _ctypes.pyd not found, ctypes will not be included"
+        extensions.remove("_ctypes.pyd")
+    
     # Add all .py files in Lib, except lib-tk, test
     dirs={}
     pydirs = [(root,"Lib")]
@@ -889,6 +895,8 @@ def add_files(db):
             # data: Lib/email/test
             # output: Lib/test
             testsuite.set_current()
+        elif not have_ctypes and dir == "ctypes":
+            continue
         else:
             default_feature.set_current()
         lib = PyDirectory(db, cab, parent, dir, dir, "%s|%s" % (parent.make_short(dir), dir))