X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=6dd7d31b6674ba194fe8846eb29734c934e03e36;hb=2d1c0c5c0bf2fb15651dcfd813ae68bff4b80535;hp=a682b2dbb2c4b58082c4e3c2145b2c7185f7bcdf;hpb=8e90984231a680415cc3f6a60f008b3029ad4548;p=monitor.git

diff --git a/setup.py b/setup.py
index a682b2d..6dd7d31 100644
--- a/setup.py
+++ b/setup.py
@@ -1,17 +1,19 @@
 #!/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' ]
+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='2.0',
       description='Monitor Utility Module',
       author='Stephen Soltesz',
       author_email='soltesz@cs.princeton.edu',
@@ -19,3 +21,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,
+)
+