Use python1.5 in default Aegis builds. Fix testing infrastructure for Python 1.5.

3 files changed, 64 insertions, 39 deletions

diff --git a/etc/SConscript b/etc/SConscript
index 4309ddb..e68663d 100644
--- a/etc/SConscript
+++ b/etc/SConscript
@@ -31,6 +31,7 @@ Import('env')
 
 files = [
     'TestCmd.py',
+    'TestCommon.py',
     'TestSCons.py',
     'unittest.py',
 ]
@@ -38,7 +39,6 @@ files = [
 def copy(target, source, env):
     t = str(target[0])
     s = str(source[0])
-    print "copy() < %s > %s" % (s, t)
     open(t, 'wb').write(open(s, 'rb').read())
 
 for file in files:
diff --git a/etc/TestCommon.py b/etc/TestCommon.py
index 0354e5b..bf84ed3 100644
--- a/etc/TestCommon.py
+++ b/etc/TestCommon.py
@@ -46,13 +46,13 @@ provided by the TestCommon class:
 The TestCommon module also provides the following variables
 
     TestCommon.python_executable
-    TestCommon._exe
-    TestCommon._obj
-    TestCommon._shobj
-    TestCommon.lib_
-    TestCommon._lib
-    TestCommon.dll_
-    TestCommon._dll
+    TestCommon.exe_suffix
+    TestCommon.obj_suffix
+    TestCommon.shobj_suffix
+    TestCommon.lib_prefix
+    TestCommon.lib_suffix
+    TestCommon.dll_prefix
+    TestCommon.dll_suffix
 
 """
 
@@ -73,7 +73,7 @@ The TestCommon module also provides the following variables
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
 __author__ = "Steven Knight <knight at baldmt dot com>"
-__revision__ = "TestCommon.py 0.6.D001 2004/03/20 17:39:42 knight"
+__revision__ = "TestCommon.py 0.6.D002 2004/03/29 06:21:41 knight"
 __version__ = "0.6"
 
 import os
@@ -87,41 +87,48 @@ from TestCmd import *
 from TestCmd import __all__
 
 __all__.extend([ 'TestCommon',
-                 '_exe', '_obj', '_shobj', 'lib_', '_lib', 'dll_', '_dll', ])
+                 'exe_suffix',
+                 'obj_suffix',
+                 'shobj_suffix',
+                 'lib_prefix',
+                 'lib_suffix',
+                 'dll_prefix',
+                 'dll_suffix',
+               ])
 
 # Variables that describe the prefixes and suffixes on this system.
 if sys.platform == 'win32':
-    _exe   = '.exe'
-    _obj   = '.obj'
-    _shobj = '.obj'
-    lib_   = ''
-    _lib   = '.lib'
-    dll_   = ''
-    _dll   = '.dll'
+    exe_suffix   = '.exe'
+    obj_suffix   = '.obj'
+    shobj_suffix = '.obj'
+    lib_prefix   = ''
+    lib_suffix   = '.lib'
+    dll_prefix   = ''
+    dll_suffix   = '.dll'
 elif sys.platform == 'cygwin':
-    _exe   = '.exe'
-    _obj   = '.o'
-    _shobj = '.os'
-    lib_   = 'lib'
-    _lib   = '.a'
-    dll_   = ''
-    _dll   = '.dll'
+    exe_suffix   = '.exe'
+    obj_suffix   = '.o'
+    shobj_suffix = '.os'
+    lib_prefix   = 'lib'
+    lib_suffix   = '.a'
+    dll_prefix   = ''
+    dll_suffix   = '.dll'
 elif string.find(sys.platform, 'irix') != -1:
-    _exe   = ''
-    _obj   = '.o'
-    _shobj = '.o'
-    lib_   = 'lib'
-    _lib   = '.a'
-    dll_   = 'lib'
-    _dll   = '.so'
+    exe_suffix   = ''
+    obj_suffix   = '.o'
+    shobj_suffix = '.o'
+    lib_prefix   = 'lib'
+    lib_suffix   = '.a'
+    dll_prefix   = 'lib'
+    dll_suffix   = '.so'
 else:
-    _exe   = ''
-    _obj   = '.o'
-    _shobj = '.os'
-    lib_   = 'lib'
-    _lib   = '.a'
-    dll_   = 'lib'
-    _dll   = '.so'
+    exe_suffix   = ''
+    obj_suffix   = '.o'
+    shobj_suffix = '.os'
+    lib_prefix   = 'lib'
+    lib_suffix   = '.a'
+    dll_prefix   = 'lib'
+    dll_suffix   = '.so'
 
 def is_List(e):
     return type(e) is types.ListType \
diff --git a/etc/TestSCons.py b/etc/TestSCons.py
index 33049c5..b39b581 100644
--- a/etc/TestSCons.py
+++ b/etc/TestSCons.py
@@ -22,9 +22,27 @@ import string
 import sys
 
 from TestCommon import *
+from TestCommon import __all__
+
+__all__.extend([ 'TestSCons',
+                 'python',
+                 '_exe',
+                 '_obj',
+                 '_shobj',
+                 'lib_',
+                 '_lib',
+                 'dll_',
+                 '_dll'
+               ])
 
 python = python_executable
-
+_exe = exe_suffix
+_obj = obj_suffix
+_shobj = shobj_suffix
+_lib = lib_suffix
+lib_ = lib_prefix
+_dll = dll_suffix
+dll_ = dll_prefix
 
 def gccFortranLibs():
     """Test whether -lfrtbegin is required.  This can probably be done in