[Python-checkins] commit of r41409 - sandbox/trunk/setuptools/setuptools/command

[phillip.eby@python.org]

Author: phillip.eby
Date: Wed Nov  9 04:23:34 2005
New Revision: 41409

Modified:
   sandbox/trunk/setuptools/setuptools/command/bdist_egg.py
Log:
Detect .dll, .so, .dylib and .pyd files that might have 
been included in a project as data files rather than as
Python extensions.  


Modified: sandbox/trunk/setuptools/setuptools/command/bdist_egg.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/command/bdist_egg.py	(original)
+++ sandbox/trunk/setuptools/setuptools/command/bdist_egg.py	Wed Nov  9 04:23:34 2005
@@ -288,31 +288,31 @@
     def get_ext_outputs(self):
         """Get a list of relative paths to C extensions in the output distro"""
 
+        outputs = []
+        paths = {self.bdist_dir:''}
+        for base, dirs, files in os.walk(self.bdist_dir):
+            for filename in files:
+                if os.path.splitext(filename)[1].lower() in NATIVE_EXTENSIONS:
+                    outputs.append(paths[base]+filename)
+            for filename in dirs:
+                paths[os.path.join(base,filename)] = paths[base]+filename+'/'
+        
         if not self.distribution.has_ext_modules():
-            return []
+            return outputs
 
         build_cmd = self.get_finalized_command('build_ext')
         prefix_len = len(build_cmd.build_lib) + len(os.sep)
 
-        outputs = []
         for filename in build_cmd.get_outputs():
-            outputs.append(filename[prefix_len:])
+            if os.path.splitext(filename)[1].lower() not in NATIVE_EXTENSIONS:
+                # only add files w/unrecognized extensions, since the
+                # recognized ones will already be in the list
+                outputs.append(filename[prefix_len:])
 
         return outputs
 
 
-
-
-
-
-
-
-
-
-
-
-
-
+NATIVE_EXTENSIONS = dict.fromkeys('.dll .so .dylib .pyd'.split())