Changeset 1931

Timestamp:

03/18/08 13:23:50

Author:

fumanchu

Message:

Fixed setup.py for the restsrv -> process change, plus fixed a couple svn props.

Files:

• trunk/MANIFEST.in (modified) (1 diff)
• trunk/cherrypy/lib/auth.py (modified) (1 prop)
• trunk/cherrypy/test/test_refleaks.py (modified) (1 prop)
• trunk/setup.py (modified) (2 diffs, 1 prop)

trunk/MANIFEST.in

@@ +1 @@
+include cherrypy/cherryd
-include cherrypy/favicon.ico
-include cherrypy/LICENSE.txt
+include cherrypy/scaffold/*.conf
+include cherrypy/scaffold/static/*.png
+include cherrypy/test/style.css
+include cherrypy/test/test.pem
+include cherrypy/test/static/*.html
+include cherrypy/test/static/*.jpg
-include cherrypy/tutorial/*.conf
-include cherrypy/tutorial/*.pdf
-include cherrypy/tutorial/*.html
-include cherrypy/tutorial/README.txt
-include cherrypy/test/style.css
-include cherrypy/test/test.pem
-include cherrypy/test/static/*.html
-include cherrypy/test/static/*.jpg
-include cherrypy/restsrv/restctl.sh

trunk/setup.py

@@ -40 +40 @@
-    "cherrypy", "cherrypy.lib",
-    "cherrypy.tutorial", "cherrypy.test",
-restsrv
+process
-]
-download_url="http://download.cherrypy.org/cherrypy/3.1.0beta3/"
-data_files=[
+    ('cherrypy', ['cherrypy/cherryd',
+                  'cherrypy/favicon.ico',
+                  'cherrypy/LICENSE.txt',
+                  ]),
+    ('cherrypy/process', []),
+    ('cherrypy/scaffold', ['cherrypy/scaffold/example.conf',
+                           'cherrypy/scaffold/site.conf',
+                           ]),
+    ('cherrypy/scaffold/static', ['made_with_cherrypy_small.png',
+                                  ]),
+    ('cherrypy/test', ['cherrypy/test/style.css',
+                       'cherrypy/test/test.pem',
+                       ]),
+    ('cherrypy/test/static', ['cherrypy/test/static/index.html',
+                              'cherrypy/test/static/dirback.jpg',]),
-    ('cherrypy/tutorial',
-        [
@@ -52 +67 @@
-        ]
-    ),
-    ('cherrypy', ['cherrypy/favicon.ico',
-                  'cherrypy/LICENSE.txt',
-                  ]),
-    ('cherrypy/restsrv', ['cherrypy/restsrv/restctl.sh',]),
-    ('cherrypy/test', ['cherrypy/test/style.css',
-                       'cherrypy/test/test.pem',
-                       ]),
-    ('cherrypy/test/static', ['cherrypy/test/static/index.html',
-                              'cherrypy/test/static/dirback.jpg',]),
-]
-###############################################################################