Changed setup.py to work no matter where it is called from. We were previously
using __file__, which isn't consistent on Windows. Some awesome debugging (and patch) here from Karen Tracey. Fixed #6562. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
99b200dac7
commit
dd2afd7105
11
setup.py
11
setup.py
|
@ -27,19 +27,16 @@ for scheme in INSTALL_SCHEMES.values():
|
|||
# an easy way to do this.
|
||||
packages, data_files = [], []
|
||||
root_dir = os.path.dirname(__file__)
|
||||
django_dir = os.path.join(root_dir, 'django')
|
||||
pieces = fullsplit(root_dir)
|
||||
if pieces[-1] == '':
|
||||
len_root_dir = len(pieces) - 1
|
||||
else:
|
||||
len_root_dir = len(pieces)
|
||||
if root_dir != '':
|
||||
os.chdir(root_dir)
|
||||
django_dir = 'django'
|
||||
|
||||
for dirpath, dirnames, filenames in os.walk(django_dir):
|
||||
# Ignore dirnames that start with '.'
|
||||
for i, dirname in enumerate(dirnames):
|
||||
if dirname.startswith('.'): del dirnames[i]
|
||||
if '__init__.py' in filenames:
|
||||
packages.append('.'.join(fullsplit(dirpath)[len_root_dir:]))
|
||||
packages.append('.'.join(fullsplit(dirpath)))
|
||||
elif filenames:
|
||||
data_files.append([dirpath, [os.path.join(dirpath, f) for f in filenames]])
|
||||
|
||||
|
|
Loading…
Reference in New Issue