hope I got the merge wright...

[monitor.git] / setup.py

diff --git a/setup.py b/setup.py
index a682b2d..a9744ee 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,21 +1,45 @@
 #!/usr/bin/python
 
 from distutils.core import setup
-#from setuptools import setup, find_packages
 
-packages=['monitor', 'monitor.database', 'monitor.database.zabbixapi', 
-               'monitor.database.info', 'monitor.pcu', 'monitor.sources', 
-               'monitor.util', 'monitor.wrapper' ]
+from monitor.monitor_version import *
+
+packages=['monitor', 
+          'monitor.database', 
+          'monitor.Rpyc', 
+          'monitor.database.zabbixapi', 
+          'monitor.database.info', 
+          'monitor.sources', 
+          'monitor.util', 
+          'monitor.wrapper']
 
-#packages = find_packages(exclude=('Rpyc', 'www', 'ssh', 'pyssh',
-#'Rpyc.Demo', 'Rpyc.Servers', 'www.HyperText'))
 print packages
 setup(name='MonitorModule',
-      version='1.1',
+      version=monitor_version,
       description='Monitor Utility Module',
       author='Stephen Soltesz',
       author_email='soltesz@cs.princeton.edu',
       url='http://www.planet-lab.org',
-         packages=packages,
-)
+      packages=packages)
+
+packages=['pcucontrol', 
+          'pcucontrol.util',
+          'pcucontrol.transports',
+          'pcucontrol.transports.ssh',
+          'pcucontrol.transports.pyssh',
+          'pcucontrol.models',
+          'pcucontrol.models.hpilo',
+          'pcucontrol.models.hpilo.iloxml',
+          'pcucontrol.models.intelamt',
+          'pcucontrol.models.intelamt']
+
+# TODO: add data dir for intelamt and hpilo stuff
+print packages
+setup(name='PCUControlModule',
+      version=pcucontrol_version,
+      description='PCU Control Module',
+      author='Stephen Soltesz',
+      author_email='soltesz@cs.princeton.edu',
+      url='http://www.planet-lab.org',
+      packages=packages)