diff options
| author | Steven Knight <knight@baldmt.com> | 2003-01-15 05:41:30 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-01-15 05:41:30 (GMT) |
| commit | 284db25033af74d831c2e6c0f18c3e9415115705 (patch) | |
| tree | 2d7f5c5c38fe6f5cfcce5fc25613150c8aefee20 /etc | |
| parent | 64d27f9efc30088f70214b4585b83707c56f6c0a (diff) | |
| download | SCons-284db25033af74d831c2e6c0f18c3e9415115705.zip SCons-284db25033af74d831c2e6c0f18c3e9415115705.tar.gz SCons-284db25033af74d831c2e6c0f18c3e9415115705.tar.bz2 | |
Necessary changes towards supporting Jython.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/TestCmd.py | 8 | ||||
| -rw-r--r-- | etc/TestSCons.py | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/etc/TestCmd.py b/etc/TestCmd.py index bac0a93..6d6db73 100644 --- a/etc/TestCmd.py +++ b/etc/TestCmd.py @@ -229,6 +229,14 @@ def match_re_dotall(lines = None, res = None): if re.compile("^" + res + "$", re.DOTALL).match(lines): return 1 +if os.name == 'java': + + python_executable = os.path.join(sys.prefix, 'jython') + +else: + + python_executable = sys.executable + if sys.platform == 'win32': def where_is(file, path=None, pathext=None): diff --git a/etc/TestSCons.py b/etc/TestSCons.py index 4b392d4..219046b 100644 --- a/etc/TestSCons.py +++ b/etc/TestSCons.py @@ -22,6 +22,8 @@ import sys import TestCmd +python = TestCmd.python_executable + class TestFailed(Exception): def __init__(self, args=None): self.args = args @@ -82,7 +84,7 @@ class TestSCons(TestCmd.TestCmd): else: kw['program'] = 'scons.py' if not kw.has_key('interpreter') and not os.environ.get('SCONS_EXEC'): - kw['interpreter'] = sys.executable + kw['interpreter'] = python if not kw.has_key('match'): kw['match'] = TestCmd.match_exact if not kw.has_key('workdir'): |