X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=a9744ee0b8c1257b711b6cd1e3ac2349eee1dfde;hb=dc1c378d0f44970c6a1382064da7089494572398;hp=0e4f001ec6afce21503c0a9b697ba9f8a5473b1a;hpb=59a5e97c767a90437946aa3aca0c8518df662084;p=monitor.git

diff --git a/setup.py b/setup.py
index 0e4f001..a9744ee 100644
--- 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.infovacuum', '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)