[Python-checkins] r51581 - in python/branches/release25-maint: Misc/NEWS Tools/msi/msi.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Fri Aug 25 02:11:38 2006
New Revision: 51581

Modified:
   python/branches/release25-maint/Misc/NEWS
   python/branches/release25-maint/Tools/msi/msi.py
Log:
Patch #1545507: Exclude ctypes package in Win64 MSI file.


Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Fri Aug 25 02:11:38 2006
@@ -36,6 +36,8 @@
 Build
 -----
 
+- Patch #1545507: Exclude ctypes package in Win64 MSI file.
+
 - Fix OpenSSL debug build process.
 
 

Modified: python/branches/release25-maint/Tools/msi/msi.py
==============================================================================
--- python/branches/release25-maint/Tools/msi/msi.py	(original)
+++ python/branches/release25-maint/Tools/msi/msi.py	Fri Aug 25 02:11:38 2006
@@ -872,6 +872,12 @@
                     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 @@
             # 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))