diff options
| author | Russel Winder <russel@winder.org.uk> | 2014-08-09 17:53:22 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2014-08-09 17:53:22 (GMT) |
| commit | 22f309a6bfcc2621fc7011813adbb14efa4559c5 (patch) | |
| tree | 61e10cf8079f383863e8bdf44c1559a688e415c2 /src/engine/SCons/Tool/JavaCommon.py | |
| parent | 032c4d44d99c4ea306f2541cafa9150e57024c21 (diff) | |
| parent | 1e7356e2a4f660c6f1cd42b92aec0c47233c1a2d (diff) | |
| download | SCons-22f309a6bfcc2621fc7011813adbb14efa4559c5.zip SCons-22f309a6bfcc2621fc7011813adbb14efa4559c5.tar.gz SCons-22f309a6bfcc2621fc7011813adbb14efa4559c5.tar.bz2 | |
Merge heads.
Diffstat (limited to 'src/engine/SCons/Tool/JavaCommon.py')
| -rw-r--r-- | src/engine/SCons/Tool/JavaCommon.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/JavaCommon.py b/src/engine/SCons/Tool/JavaCommon.py index 6dd6051..8b13f9f 100644 --- a/src/engine/SCons/Tool/JavaCommon.py +++ b/src/engine/SCons/Tool/JavaCommon.py @@ -65,7 +65,7 @@ if java_parsing: def __init__(self, version=default_java_version): if not version in ('1.1', '1.2', '1.3','1.4', '1.5', '1.6', '1.7', - '5', '6'): + '1.8', '5', '6'): msg = "Java version %s not supported" % version raise NotImplementedError(msg) @@ -171,7 +171,7 @@ if java_parsing: if self.version in ('1.1', '1.2', '1.3', '1.4'): clazz = self.listClasses[0] self.listOutputs.append('%s$%d' % (clazz, self.nextAnon)) - elif self.version in ('1.5', '1.6', '1.7', '5', '6'): + elif self.version in ('1.5', '1.6', '1.7', '1.8', '5', '6'): self.stackAnonClassBrackets.append(self.brackets) className = [] className.extend(self.listClasses) |