diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-08-25 15:11:39 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-08-25 15:11:39 +0200 |
| commit | b2fa39f7baf24a9da2ee40e6d625e8ce91c4b471 (patch) | |
| tree | f9eca9049e11ca23426f8cf8b5302f65b547d49d /engine/SCons/Tool/JavaCommon.py | |
| parent | df9075291049202264a88a9740f281a55823ff62 (diff) | |
| parent | 765fbac29295fb4e462c480d09dbdb2f9718a845 (diff) | |
Merge tag 'upstream/2.3.3'
Upstream version 2.3.3
Diffstat (limited to 'engine/SCons/Tool/JavaCommon.py')
| -rw-r--r-- | engine/SCons/Tool/JavaCommon.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/SCons/Tool/JavaCommon.py b/engine/SCons/Tool/JavaCommon.py index 55dc558..8cceff8 100644 --- a/engine/SCons/Tool/JavaCommon.py +++ b/engine/SCons/Tool/JavaCommon.py @@ -27,7 +27,7 @@ Stuff for processing Java. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/JavaCommon.py 2014/07/05 09:42:21 garyo" +__revision__ = "src/engine/SCons/Tool/JavaCommon.py 2014/08/24 12:12:31 garyo" import os import os.path @@ -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) |