summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2006-08-25 00:03:34 +0000
committerMartin v. Löwis <martin@v.loewis.de>2006-08-25 00:03:34 +0000
commit38325b730f23e21d209e51f07ea5e5fa9b83fb85 (patch)
treea9e4957a1d6d509de7ee318f2c40af693ce0a0f5
parent9e398cac94cd15385e79d70e3575fd2945e0b76d (diff)
downloadcpython-git-38325b730f23e21d209e51f07ea5e5fa9b83fb85.tar.gz
Patch #1545507: Exclude ctypes package in Win64 MSI file.
Will backport to 2.5.
-rw-r--r--Tools/msi/msi.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 8a72eb93d0..f06944f430 100644
--- 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))