X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=setup.py;h=d3dbde99d41779c4a2b95acdd3ddc3c9e931f7b4;hp=421e67340b9d4fb6e93747a62aab625c9ff7465a;hb=HEAD;hpb=ac841d414d7b09f8a0b7883bcdba0eeb6aede69f

diff --git a/setup.py b/setup.py
index 421e673..d3dbde9 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.database.infovacuum.model', '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)