diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2012-09-16 16:24:21 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2012-09-16 16:24:21 (GMT) |
| commit | caabe8248c727925f4158aa074ac472e033361fc (patch) | |
| tree | e1de5248d67927e1980bc5ad91b693bb6af12da7 /src/engine/SCons/Tool/JavaCommon.py | |
| parent | 71e49a9594f1ece94cc9011647ba81018338259e (diff) | |
| parent | 299a549ae875c18748f395aca51068e27ac0d489 (diff) | |
| download | SCons-caabe8248c727925f4158aa074ac472e033361fc.zip SCons-caabe8248c727925f4158aa074ac472e033361fc.tar.gz SCons-caabe8248c727925f4158aa074ac472e033361fc.tar.bz2 | |
Merged in dirkbaechle/scons (pull request #36): test cleanups and fixes.
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 c64d254..156ef97 100644 --- a/src/engine/SCons/Tool/JavaCommon.py +++ b/src/engine/SCons/Tool/JavaCommon.py @@ -64,7 +64,7 @@ if java_parsing: interfaces, and anonymous inner classes.""" def __init__(self, version=default_java_version): - if not version in ('1.1', '1.2', '1.3','1.4', '1.5', '1.6', + if not version in ('1.1', '1.2', '1.3','1.4', '1.5', '1.6', '1.7', '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', '5', '6'): + elif self.version in ('1.5', '1.6', '1.7', '5', '6'): self.stackAnonClassBrackets.append(self.brackets) className = [] className.extend(self.listClasses) |