Changeset 4912

Timestamp:

04/03/07 07:28:19 (1 year ago)

Author:

mtredinnick

Message:

Fixed #3338, #3536, #3796 -- Fixed a bunch of setup and build problems in a
portable fashion. That took a *lot* longer to debug than I thought it would, so
let's try not to break it.

Files:

• django/trunk/MANIFEST.in (modified) (1 diff)
• django/trunk/scripts/rpm-install.sh (modified) (2 diffs)
• django/trunk/setup.cfg (modified) (1 diff)
• django/trunk/setup.py (modified) (3 diffs)

django/trunk/MANIFEST.in

@@ +1 @@
+include README
-include AUTHORS
-include INSTALL
-include LICENSE
+include MANIFEST.in
-recursive-include docs *
-recursive-include scripts *
+recursive-include examples *
+recursive-include extras *
-recursive-include django/conf/locale *
-recursive-include django/contrib/admin/templates *

django/trunk/scripts/rpm-install.sh

@@ -1 +1 @@
-#! /bin/sh
-#
-
-
+
-#
-
-this is, what dist.py normally does
+This is what dist.py normally does.
-python setup.py install --root=${RPM_BUILD_ROOT} --record="INSTALLED_FILES"
-
+# Sort the filelist so that directories appear before files. This avoids
+# duplicate filename problems on some systems.
+touch DIRS
-for i in `cat INSTALLED_FILES`; do
-  if [ -f ${RPM_BUILD_ROOT}/$i ]; then
@@ -17 +19 @@
-done
-
-
+
+
+

django/trunk/setup.cfg

@@ -1 +1 @@
-[bdist_rpm]
-/*.txt
+ examples extras AUTHORS INSTALL LICENSE README
-install-script = scripts/rpm-install.sh
-

django/trunk/setup.py

@@ -3 +3 @@
-import os
-import sys
+
+def fullsplit(path, result=None):
+    """
+    Split a pathname into components (the opposite of os.path.join) in a
+    platform-neutral way.
+    """
+    if result is None:
+        result = []
+    head, tail = os.path.split(path)
+    if head == '':
+        return [tail] + result
+    if head == path:
+        return result
+    return fullsplit(head, [tail] + result)
-
-# Tell distutils to put the data_files in platform-specific installation
@@ -14 +28 @@
-packages, data_files = [], []
-root_dir = os.path.dirname(__file__)
-len_root_dir = len(root_dir)
-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)
-
-for dirpath, dirnames, filenames in os.walk(django_dir):
@@ -22 +40 @@
-        if dirname.startswith('.'): del dirnames[i]
-    if '__init__.py' in filenames:
-
-
-
+
+
-        data_files.append([dirpath, [os.path.join(dirpath, f) for f in filenames]])
-
-# Small hack for working with bdist_wininst.
-# See http://mail.python.org/pipermail/distutils-sig/2004-August/004134.html
-if len(sys.argv) > 1 and sys.argv[1] == 'bdist_wininst':
-    for file_info in data_files:
-        file_info[0] = '/PURELIB/%s' % file_info[0]
-
-# Dynamically calculate the version based on django.VERSION.
-
+
+
+
+
+
-
-setup(