remove simplejson dependency

[plcapi.git] / setup.py

diff --git a/setup.py b/setup.py
index e858db7..4ead837 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -5,27 +5,20 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
-#
 
 from distutils.core import setup
 from glob import glob
 
-setup(py_modules = ['ModPython'],
-      packages = ['PLC', 'PLC/Methods', 'PLC/Methods/system', 'PLC/Accessors', 'PLC/Legacy'],
+setup(packages = ['PLC', 'PLC/Methods', 'PLC/Methods/system', 'PLC/Accessors', 'aspects'],
       scripts = ['plcsh', 'Server.py'],
       data_files = [
         ('', ['planetlab5.sql']),
+        # package for mod_python and mod_wsgi, defer choice to myplc
+        ('apache', ['apache/ModPython.py', 'apache/__init__.py', 'apache/plc.wsgi']),
         ('php', ['php/plc_api.php']),
         ('migrations', 
          ['migrations/README.txt',
           'migrations/extract-views.py'] 
          + glob('migrations/[0-9][0-9][0-9]*')),
-        ('migrations/v4-to-v5', 
-         ['migrations/v4-to-v5/migrate.sh',
-          'migrations/v4-to-v5/migrate.sed',
-          'migrations/v4-to-v5/migrate.sql',
-          'migrations/v4-to-v5/parse-site-nodegroups.py',
-          'migrations/v4-to-v5/site-nodegroups.def'
-          ]),
+        ('extensions', ['extensions/README.txt']),
         ])