Changeset 3679

Timestamp:

29/11/08 23:40:05 (6 weeks ago)

Author:

tack

Message:

Remove Extension.del which caused config.h unlink to sometimes fail
due to the unpredictability of how objects get destroyed on shutdown.
Reimplement instead as an explicit Extension.clean() method.

Files:

• trunk/base/src/distribution/core.py (modified) (2 diffs)

trunk/base/src/distribution/core.py

@@ -358 +358 @@
             libraries.extend(lib.libraries)
 
-        return distutils.core.Extension(self.output, self.files,
-                                        library_dirs=library_dirs,
-                                        include_dirs=include_dirs,
-                                        libraries=libraries,
-                                        extra_compile_args=self.extra_compile_args)
-
-    def __del__(self):
+        ext = distutils.core.Extension(self.output, self.files,
+                                       library_dirs=library_dirs,
+                                       include_dirs=include_dirs,
+                                       libraries=libraries,
+                                       extra_compile_args=self.extra_compile_args)
+
+        # Keep a reference to self in the distutils Extension object, so that
+        # after distutils.setup() is run, we can clean() the kaa Extension 
+        # object.
+        ext._kaa_ext = self
+        return ext
+
+
+    def clean(self):
         """
         Delete the config file.
@@ -589 +596 @@
 
     # run the distutils.setup function
-    return distutils.core.setup(**kwargs)
+    result = distutils.core.setup(**kwargs)
+    # Run cleanup on extensions (for example to delete config.h)
+    for ext in kwargs['ext_modules']:
+        ext._kaa_ext.clean()