diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2009-05-29 01:16:27 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2009-05-29 01:16:27 (GMT) |
| commit | e37968dcdb65b228ec5bf0f738ca9121dd9282f2 (patch) | |
| tree | 63665c6846af12f3677bada7e512b7a6e6b9b8d6 /src/engine/SCons/Tool/JavaCommon.py | |
| parent | fe651b112c2182a058312b8803b86b99db59f8ff (diff) | |
| download | SCons-e37968dcdb65b228ec5bf0f738ca9121dd9282f2.zip SCons-e37968dcdb65b228ec5bf0f738ca9121dd9282f2.tar.gz SCons-e37968dcdb65b228ec5bf0f738ca9121dd9282f2.tar.bz2 | |
Fix for issue 2088: Java version 5 is same as 1.5 and 6 is same as 1.6.
Diffstat (limited to 'src/engine/SCons/Tool/JavaCommon.py')
| -rw-r--r-- | src/engine/SCons/Tool/JavaCommon.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/JavaCommon.py b/src/engine/SCons/Tool/JavaCommon.py index 6f513f1..cc2c536 100644 --- a/src/engine/SCons/Tool/JavaCommon.py +++ b/src/engine/SCons/Tool/JavaCommon.py @@ -65,7 +65,8 @@ 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', + '5', '6'): msg = "Java version %s not supported" % version raise NotImplementedError, msg @@ -171,7 +172,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'): + elif self.version in ('1.5', '1.6', '5', '6'): self.stackAnonClassBrackets.append(self.brackets) className = [] className.extend(self.listClasses) |