Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-04-11 18:14:19 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-04-11 18:14:56 (GMT) |
| commit | d9a29f93cd4ff505e264974febd0566ae29880ca (patch) | |
| tree | 6eea9e476374863e93c80aacb76840ac24f0c50f /3rdParty/SCons/scons-local/SCons/Tool/JavaCommon.py | |
| parent | 73f845a3f380c5a1adbac2cf29e9f36cc9b498cf (diff) | |
| download | swift-d9a29f93cd4ff505e264974febd0566ae29880ca.zip swift-d9a29f93cd4ff505e264974febd0566ae29880ca.tar.bz2 | |
Update SCons to 1.3.0.d20100404.
Diffstat (limited to '3rdParty/SCons/scons-local/SCons/Tool/JavaCommon.py')
| -rw-r--r-- | 3rdParty/SCons/scons-local/SCons/Tool/JavaCommon.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/3rdParty/SCons/scons-local/SCons/Tool/JavaCommon.py b/3rdParty/SCons/scons-local/SCons/Tool/JavaCommon.py index cc3e421..2c5b5a2 100644 --- a/3rdParty/SCons/scons-local/SCons/Tool/JavaCommon.py +++ b/3rdParty/SCons/scons-local/SCons/Tool/JavaCommon.py @@ -5,7 +5,7 @@ Stuff for processing Java. """ # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The SCons Foundation +# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -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 4043 2009/02/23 09:06:45 scons" +__revision__ = "src/engine/SCons/Tool/JavaCommon.py 4761 2010/04/04 14:04:44 bdeegan" import os import os.path @@ -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) |