Changeset 8215 for django/branches/gis/setup.py

Timestamp:

08/05/08 12:15:33 (4 months ago)

Author:

jbronn

Message:

gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.

Files:

• django/branches/gis (modified) (1 prop)
• django/branches/gis/setup.py (modified) (2 diffs)

django/branches/gis/setup.py

@@ -1 +1 @@
-from distutils.core import setup
+from distutils.command.install_data import install_data
-from distutils.command.install import INSTALL_SCHEMES
-import os
-import sys
+
+class osx_install_data(install_data):
+    # On MacOS, the platform-specific lib dir is /System/Library/Framework/Python/.../
+    # which is wrong. Python 2.5 supplied with MacOS 10.5 has an Apple-specific fix
+    # for this in distutils.command.install_data#306. It fixes install_lib but not
+    # install_data, which is why we roll our own install_data class.
+
+    def finalize_options(self):
+        # By the time finalize_options is called, install.install_lib is set to the
+        # fixed directory, so we set the installdir to install_lib. The
+        # install_data class uses ('install_data', 'install_dir') instead.
+        self.set_undefined_options('install', ('install_lib', 'install_dir'))
+        install_data.finalize_options(self)
+
+if sys.platform == "darwin": 
+    cmdclasses = {'install_data': osx_install_data} 
+else: 
+    cmdclasses = {'install_data': install_data} 
-
-def fullsplit(path, result=None):
@@ -56 +75 @@
-    description = 'A high-level Python Web framework that encourages rapid development and clean, pragmatic design.',
-    packages = packages,
+    cmdclass = cmdclasses,
-    data_files = data_files,
-    scripts = ['django/bin/django-admin.py'],