Skip to content

Commit

Permalink
Fixed #7414: fixed setup.py on OSX 10.5. Thanks, ajs.
Browse files Browse the repository at this point in the history
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8019 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
jacob committed Jul 21, 2008
1 parent 00259b5 commit 40fc307
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 0 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Expand Up @@ -41,6 +41,7 @@ And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS --
people who have submitted patches, reported bugs, added translations, helped
answer newbie questions, and generally made Django that much better:

ajs <adi@sieker.info>
alang@bright-green.com
Marty Alchin <gulopine@gamemusic.org>
atlithorn <atlithorn@gmail.com>
Expand Down
20 changes: 20 additions & 0 deletions setup.py
@@ -1,8 +1,27 @@
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):
"""
Split a pathname into components (the opposite of os.path.join) in a
Expand Down Expand Up @@ -55,6 +74,7 @@ def fullsplit(path, result=None):
author_email = 'foundation@djangoproject.com',
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'],
)

0 comments on commit 40fc307

Please sign in to comment.