|
|
@ -803,8 +803,8 @@ class Environment: |
|
|
|
p, out, err = Popen_safe(exelist + ['-version']) |
|
|
|
p, out, err = Popen_safe(exelist + ['-version']) |
|
|
|
except OSError: |
|
|
|
except OSError: |
|
|
|
raise EnvironmentException('Could not execute Java compiler "%s"' % ' '.join(exelist)) |
|
|
|
raise EnvironmentException('Could not execute Java compiler "%s"' % ' '.join(exelist)) |
|
|
|
version = search_version(err) |
|
|
|
|
|
|
|
if 'javac' in out or 'javac' in err: |
|
|
|
if 'javac' in out or 'javac' in err: |
|
|
|
|
|
|
|
version = search_version(err if 'javac' in err else out) |
|
|
|
return JavaCompiler(exelist, version) |
|
|
|
return JavaCompiler(exelist, version) |
|
|
|
raise EnvironmentException('Unknown compiler "' + ' '.join(exelist) + '"') |
|
|
|
raise EnvironmentException('Unknown compiler "' + ' '.join(exelist) + '"') |
|
|
|
|
|
|
|
|
|
|
|