made the install work with or without the WebwareExp package

1 files changed, 16 insertions, 5 deletions

diff --git a/setup.py b/setup.py
index 3b7e18a..54ac3a0 100755
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,21 @@
 #!/usr/bin/env python
-# $Id: setup.py,v 1.10 2001/10/10 06:59:45 tavis_rudd Exp $
+# $Id: setup.py,v 1.11 2002/03/02 20:26:17 tavis_rudd Exp $
 
-import SetupTools
-import SetupConfig
-configurations = (SetupConfig,)
-SetupTools.run_setup( configurations )
+try:                           # see if WebwareExp's Setup procedure can be used
+    from src._properties import Version, Description
+    long_description = open('README').read()
+    settings= {'name': 'Cheetah',
+               'version':Version,
+               'long_description':long_description,
+               'description':Description,
+               }
+    from Webware.Setup import SetupManager
+    SetupManager(searchPath=['.'],settings=settings)
+except ImportError:
+    import SetupTools
+    import SetupConfig
+    configurations = (SetupConfig,)
+    SetupTools.run_setup( configurations )