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

diff --git a/setup.py b/setup.py
index 0e4f001..f9cb03a 100644
--- a/setup.py
+++ b/setup.py
@@ -1,17 +1,18 @@
 #!/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' ]
+packages=[	'monitor', 
+			'monitor.database', 
+			'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='2.0',
       description='Monitor Utility Module',
       author='Stephen Soltesz',
       author_email='soltesz@cs.princeton.edu',
@@ -19,3 +20,27 @@ setup(name='MonitorModule',
 	  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='2.0',
+      description='PCU Control Module',
+      author='Stephen Soltesz',
+      author_email='soltesz@cs.princeton.edu',
+      url='http://www.planet-lab.org',
+	  packages=packages,
+)
+