Updated distutils to pick up the restructured rteval

Also pick the rteval version from the module itself, to avoid
having it hardcoded more places.

Signed-off-by: David Sommerseth <davids@redhat.com>

2 files changed, 20 insertions, 8 deletions

diff --git a/rteval/__init__.py b/rteval/__init__.py
index f3d93fe..1733529 100644
--- a/rteval/__init__.py
+++ b/rteval/__init__.py
@@ -18,6 +18,7 @@ from Log import Log
 import rtevalConfig, rtevalMailer
 
 
+RTEVAL_VERSION = "2.0_pre"
 
 sigint_received = False
 def sigint_handler(signum, frame):
@@ -34,7 +35,7 @@ def sigterm_handler(signum, frame):
 
 class RtEval(rtevalReport):
     def __init__(self, config, loadmods, measuremods, logger):
-        self.__version = "2.0_pre"
+        self.__version = RTEVAL_VERSION
 
         if not isinstance(config, rtevalConfig.rtevalConfig):
             raise TypeError("config variable is not an rtevalConfig object")
diff --git a/setup.py b/setup.py
index f0dd6d9..33d1652 100644
--- a/setup.py
+++ b/setup.py
@@ -2,17 +2,23 @@
 from distutils.sysconfig import get_python_lib
 from distutils.core import setup
 from os.path import isfile, join
-import glob
-import os
+import glob, os, shutil
+from rteval import RTEVAL_VERSION
+from rteval.sysinfo import dmi         # Just to get rid of a warning
 
 # Get PYTHONLIB with no prefix so --prefix installs work.
 PYTHONLIB = join(get_python_lib(standard_lib=1, prefix=''), 'site-packages')
 
+
+# DMI module might be loaded, so ignore any warnings it may have
+dmi.ProcessWarnings()
+
+
 setup(name="rteval",
-      version = "1.36",
-      description = "evaluate system performance for Realtime",
-      author = "Clark Williams",
-      author_email = "williams@redhat.com",
+      version = RTEVAL_VERSION,
+      description = "Evaluate system performance for Realtime",
+      author = "Clark Williams, David Sommerseth",
+      author_email = "williams@redhat.com, davids@redhat.com",
       license = "GPLv2",
       long_description =
 """\
@@ -26,5 +32,10 @@ of time. When the run is finished, the sample data from cyclictest is
 analyzed for standard statistical measurements (i.e mode, median, range,
 mean, variance and standard deviation) and a report is generated. 
 """,
-      packages = ["rteval"],
+      packages = ["rteval",
+                  "rteval.modules",
+                  "rteval.modules.loads",
+                  "rteval.modules.measurement",
+                  "rteval.sysinfo"],
+      scripts = ["rteval-cmd"],
       )