diff options
| author | Greg Ward <greg@gerg.ca> | 2012-03-17 20:04:42 (GMT) |
|---|---|---|
| committer | Greg Ward <greg@gerg.ca> | 2012-03-17 20:04:42 (GMT) |
| commit | a16ccac6e69f38d5a8531ec81c988e28aaf287bf (patch) | |
| tree | 558bcd653a53240755e648ca0d23fb7f6d369231 /src/engine/SCons/Tool/javac.py | |
| parent | a2bfc43f503a2ffb4b3afb6feab7f73e6be518aa (diff) | |
| download | SCons-a16ccac6e69f38d5a8531ec81c988e28aaf287bf.zip SCons-a16ccac6e69f38d5a8531ec81c988e28aaf287bf.tar.gz SCons-a16ccac6e69f38d5a8531ec81c988e28aaf287bf.tar.bz2 | |
Add more tests for SCons.Tool.javac.pathopt; fix exposed bugs.
(Specifically, having a default path without setting the corresponding
construction variable did not work.)
Diffstat (limited to 'src/engine/SCons/Tool/javac.py')
| -rw-r--r-- | src/engine/SCons/Tool/javac.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/javac.py b/src/engine/SCons/Tool/javac.py index 20d7a94..b19f2a1 100644 --- a/src/engine/SCons/Tool/javac.py +++ b/src/engine/SCons/Tool/javac.py @@ -150,7 +150,11 @@ class pathopt(object): if path and not SCons.Util.is_List(path): path = [path] if self.default: - path = path + [ env[self.default] ] + default = env[self.default] + if default: + if not SCons.Util.is_List(default): + default = [default] + path = path + default if path: return [self.opt, os.pathsep.join(map(str, path))] #return self.opt + " " + os.pathsep.join(path) |