Changeset 8019

Timestamp:

07/21/08 11:30:32 (5 months ago)

Author:

jacob

Message:

Fixed #7414: fixed setup.py on OSX 10.5. Thanks, ajs.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/setup.py (modified) (2 diffs)

django/trunk/AUTHORS

@@ -42 +42 @@
-answer newbie questions, and generally made Django that much better:
-
+    ajs <adi@sieker.info>
-    alang@bright-green.com
-    Marty Alchin <gulopine@gamemusic.org>

django/trunk/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 plattform specific lib dir is /System/Library/Framework/Python/.../
+    # which is wrong. Python 2.5 supplied with MacOS 10.5 has an Aplle 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 for 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'],