1 | diff -u -r Nevow-0.9.18.orig/setup.py Nevow-0.9.18/setup.py |
---|
2 | --- Nevow-0.9.18.orig/setup.py 2007-04-29 17:51:38.000000000 -0600 |
---|
3 | +++ Nevow-0.9.18/setup.py 2008-01-23 16:48:33.000000000 -0700 |
---|
4 | @@ -1,50 +1,77 @@ |
---|
5 | #!/usr/bin/env python |
---|
6 | # -*- test-case-name: "nevow.test -xformless.test" -*- |
---|
7 | |
---|
8 | -import os.path |
---|
9 | -from distutils.core import setup |
---|
10 | -import glob |
---|
11 | -import sys |
---|
12 | -import setupcommon |
---|
13 | - |
---|
14 | -# Where should our data files go? |
---|
15 | -# They want to go in our package directory , which is under site-packages. |
---|
16 | -# We determine the location of site-packages here, for later use. It will be |
---|
17 | -# interpreted as relative to sys.prefix. |
---|
18 | -# This junk can go once we decide to drop Python 2.3 support or switch to |
---|
19 | -# setuptools. package_data is a much cleaner solution. |
---|
20 | -if sys.platform.lower().startswith('win'): |
---|
21 | - site_packages = 'Lib/site-packages/' |
---|
22 | +try: |
---|
23 | + import setuptools |
---|
24 | +except ImportError: |
---|
25 | + # Couldn't import setuptools, so use this setup script: |
---|
26 | + |
---|
27 | + import os.path |
---|
28 | + from distutils.core import setup |
---|
29 | + import glob |
---|
30 | + import sys |
---|
31 | + import setupcommon |
---|
32 | + |
---|
33 | + # Where should our data files go? |
---|
34 | + # They want to go in our package directory , which is under site-packages. |
---|
35 | + # We determine the location of site-packages here, for later use. It will be |
---|
36 | + # interpreted as relative to sys.prefix. |
---|
37 | + # This junk can go once we decide to drop Python 2.3 support or switch to |
---|
38 | + #setuptools. package_data is a much cleaner solution. |
---|
39 | + if sys.platform.lower().startswith('win'): |
---|
40 | + site_packages = 'Lib/site-packages/' |
---|
41 | + else: |
---|
42 | + version = '.'.join([str(i) for i in sys.version_info[:2]]) |
---|
43 | + site_packages = 'lib/python' + version + '/site-packages/' |
---|
44 | + |
---|
45 | + # Turn the package_data into a data_files for 2.3 compatability |
---|
46 | + data_files = [] |
---|
47 | + for pkg, patterns in setupcommon.package_data.items(): |
---|
48 | + pkgdir = os.path.join(*pkg.split('.')) |
---|
49 | + for pattern in patterns: |
---|
50 | + globdir = os.path.dirname(pattern) |
---|
51 | + files = glob.glob(os.path.join(pkgdir, pattern)) |
---|
52 | + data_files.append((os.path.join(site_packages,pkgdir,globdir),files)) |
---|
53 | + |
---|
54 | + # We need to list the packages explicitly. |
---|
55 | + packages = [ |
---|
56 | + 'formless', 'formless.test', 'nevow', 'nevow.flat', |
---|
57 | + 'nevow.scripts', 'nevow.test', 'nevow.taglibrary', |
---|
58 | + 'nevow.plugins', 'nevow.livetrial'] |
---|
59 | + |
---|
60 | + setup( |
---|
61 | + name=setupcommon.name, |
---|
62 | + version=setupcommon.version, |
---|
63 | + maintainer=setupcommon.maintainer, |
---|
64 | + maintainer_email=setupcommon.maintainer_email, |
---|
65 | + description=setupcommon.description, |
---|
66 | + url=setupcommon.url, |
---|
67 | + license=setupcommon.license, |
---|
68 | + platforms=setupcommon.platforms, |
---|
69 | + classifiers=setupcommon.classifiers, |
---|
70 | + packages=packages, |
---|
71 | + scripts=setupcommon.scripts, |
---|
72 | + data_files=data_files, |
---|
73 | + ) |
---|
74 | else: |
---|
75 | - version = '.'.join([str(i) for i in sys.version_info[:2]]) |
---|
76 | - site_packages = 'lib/python' + version + '/site-packages/' |
---|
77 | + # Could import setuptools, so use this setup script: |
---|
78 | + |
---|
79 | + from setuptools import setup, find_packages |
---|
80 | + import setupcommon |
---|
81 | + |
---|
82 | + setup( |
---|
83 | + name=setupcommon.name, |
---|
84 | + version=setupcommon.version, |
---|
85 | + maintainer=setupcommon.maintainer, |
---|
86 | + maintainer_email=setupcommon.maintainer_email, |
---|
87 | + description=setupcommon.description, |
---|
88 | + url=setupcommon.url, |
---|
89 | + license=setupcommon.license, |
---|
90 | + platforms=setupcommon.platforms, |
---|
91 | + classifiers=setupcommon.classifiers, |
---|
92 | + packages=find_packages(), |
---|
93 | + scripts=setupcommon.scripts, |
---|
94 | + package_data=setupcommon.package_data, |
---|
95 | + zip_safe = True, |
---|
96 | + ) |
---|
97 | |
---|
98 | -# Turn the package_data into a data_files for 2.3 compatability |
---|
99 | -data_files = [] |
---|
100 | -for pkg, patterns in setupcommon.package_data.items(): |
---|
101 | - pkgdir = os.path.join(*pkg.split('.')) |
---|
102 | - for pattern in patterns: |
---|
103 | - globdir = os.path.dirname(pattern) |
---|
104 | - files = glob.glob(os.path.join(pkgdir, pattern)) |
---|
105 | - data_files.append((os.path.join(site_packages,pkgdir,globdir),files)) |
---|
106 | - |
---|
107 | -# We need to list the packages explicitly. |
---|
108 | -packages = [ |
---|
109 | - 'formless', 'formless.test', 'nevow', 'nevow.flat', |
---|
110 | - 'nevow.scripts', 'nevow.test', 'nevow.taglibrary', |
---|
111 | - 'nevow.plugins', 'nevow.livetrial'] |
---|
112 | - |
---|
113 | -setup( |
---|
114 | - name=setupcommon.name, |
---|
115 | - version=setupcommon.version, |
---|
116 | - maintainer=setupcommon.maintainer, |
---|
117 | - maintainer_email=setupcommon.maintainer_email, |
---|
118 | - description=setupcommon.description, |
---|
119 | - url=setupcommon.url, |
---|
120 | - license=setupcommon.license, |
---|
121 | - platforms=setupcommon.platforms, |
---|
122 | - classifiers=setupcommon.classifiers, |
---|
123 | - packages=packages, |
---|
124 | - scripts=setupcommon.scripts, |
---|
125 | - data_files=data_files, |
---|
126 | - ) |
---|
127 | Only in Nevow-0.9.18: setup.py~ |
---|
128 | diff -u -r Nevow-0.9.18.orig/setup_egg.py Nevow-0.9.18/setup_egg.py |
---|
129 | --- Nevow-0.9.18.orig/setup_egg.py 2005-10-15 15:02:14.000000000 -0600 |
---|
130 | +++ Nevow-0.9.18/setup_egg.py 2008-01-23 16:48:52.000000000 -0700 |
---|
131 | @@ -1,28 +0,0 @@ |
---|
132 | -#!/usr/bin/env python |
---|
133 | -# -*- test-case-name: "nevow.test -xformless.test" -*- |
---|
134 | - |
---|
135 | -# Use setuptools, it's easier |
---|
136 | -from ez_setup import use_setuptools |
---|
137 | -use_setuptools() |
---|
138 | -from setuptools import setup, find_packages |
---|
139 | -import setupcommon |
---|
140 | - |
---|
141 | -# Import Nevow for the version string |
---|
142 | -import nevow |
---|
143 | - |
---|
144 | -setup( |
---|
145 | - name=setupcommon.name, |
---|
146 | - version=setupcommon.version, |
---|
147 | - maintainer=setupcommon.maintainer, |
---|
148 | - maintainer_email=setupcommon.maintainer_email, |
---|
149 | - description=setupcommon.description, |
---|
150 | - url=setupcommon.url, |
---|
151 | - license=setupcommon.license, |
---|
152 | - platforms=setupcommon.platforms, |
---|
153 | - classifiers=setupcommon.classifiers, |
---|
154 | - packages=find_packages(), |
---|
155 | - scripts=setupcommon.scripts, |
---|
156 | - package_data=setupcommon.package_data, |
---|
157 | - zip_safe = True, |
---|
158 | - ) |
---|
159 | - |
---|