diff options
| author | William Deegan <bill@baddogconsulting.com> | 2018-05-11 21:28:57 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2018-05-11 21:28:57 (GMT) |
| commit | f48da72a3156d90bd6d58a840df1be2b013c5e9b (patch) | |
| tree | d8e530f4528e74e4b03328bc4e8fa4e50a153e87 /testing | |
| parent | 96d638297a71925053b164578506f44deac12acf (diff) | |
| download | SCons-f48da72a3156d90bd6d58a840df1be2b013c5e9b.zip SCons-f48da72a3156d90bd6d58a840df1be2b013c5e9b.tar.gz SCons-f48da72a3156d90bd6d58a840df1be2b013c5e9b.tar.bz2 | |
Add some reasonable default windows paths to find java.
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/framework/TestSCons.py | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/testing/framework/TestSCons.py b/testing/framework/TestSCons.py index ba4e06b..d847845 100644 --- a/testing/framework/TestSCons.py +++ b/testing/framework/TestSCons.py @@ -692,20 +692,29 @@ class TestSCons(TestCommon): env = SCons.Environment.Environment() self._java_env[version] = env - if version: - patterns = [ - '/usr/java/jdk%s*/bin' % version, - '/usr/lib/jvm/*-%s*/bin' % version, - '/usr/local/j2sdk%s*/bin' % version, - ] + if sys.platform == 'win32': + patterns = [ + 'C:/Program Files/Java/jdk%s*/bin'%version, + ] + else: + patterns = [ + '/usr/java/jdk%s*/bin' % version, + '/usr/lib/jvm/*-%s*/bin' % version, + '/usr/local/j2sdk%s*/bin' % version, + ] java_path = self.paths(patterns) + [env['ENV']['PATH']] else: - patterns = [ - '/usr/java/latest/bin', - '/usr/lib/jvm/*/bin', - '/usr/local/j2sdk*/bin', - ] + if sys.platform == 'win32': + patterns = [ + 'C:/Program Files/Java/jdk*/bin', + ] + else: + patterns = [ + '/usr/java/latest/bin', + '/usr/lib/jvm/*/bin', + '/usr/local/j2sdk*/bin', + ] java_path = self.paths(patterns) + [env['ENV']['PATH']] env['ENV']['PATH'] = os.pathsep.join(java_path) |