diff options
| author | dirkbaechle <devnull@localhost> | 2012-09-06 23:16:49 (GMT) |
|---|---|---|
| committer | dirkbaechle <devnull@localhost> | 2012-09-06 23:16:49 (GMT) |
| commit | 299a549ae875c18748f395aca51068e27ac0d489 (patch) | |
| tree | 3d3613396456a717288d7b5e20f38eb5833c5698 /src | |
| parent | 1c8744b6d4ec8812746415d1aae4f13e634809ca (diff) | |
| download | SCons-299a549ae875c18748f395aca51068e27ac0d489.zip SCons-299a549ae875c18748f395aca51068e27ac0d489.tar.gz SCons-299a549ae875c18748f395aca51068e27ac0d489.tar.bz2 | |
- added two new functions must_exist_one_of/must_not_exist_any_of to TestCmd,
supporting wildcards
- rewrote several test/packaging tests, using the new matching functions instead
of relying on the os.uname() machine value for determining the resulting RPM filename
- renamed glob modules in test/scons-time to avoid name clashes
- minor fix: added Java 1.7 as supported version to Tool/JavaCommon.py
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Tool/JavaCommon.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/JavaCommon.py b/src/engine/SCons/Tool/JavaCommon.py index bb9caab..156ef97 100644 --- a/src/engine/SCons/Tool/JavaCommon.py +++ b/src/engine/SCons/Tool/JavaCommon.py @@ -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) |