diff options
| author | William Deegan <bill@baddogconsulting.com> | 2018-09-19 19:45:10 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-19 19:45:10 (GMT) |
| commit | aa6e30ebd8dfebcb6cb813171b78ff3c4e342b93 (patch) | |
| tree | d36153f5681805450e1eec33c820b788bf0cbef7 | |
| parent | c53e548e750f31917e36ed35af8519ebfc85344e (diff) | |
| parent | fe27baf677366633c9ec64f2f7b22cb4063adc28 (diff) | |
| download | SCons-aa6e30ebd8dfebcb6cb813171b78ff3c4e342b93.zip SCons-aa6e30ebd8dfebcb6cb813171b78ff3c4e342b93.tar.gz SCons-aa6e30ebd8dfebcb6cb813171b78ff3c4e342b93.tar.bz2 | |
Merge pull request #3196 from mwichmann/java11
Add java 11
| -rw-r--r-- | src/CHANGES.txt | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/JavaCommon.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 6f7e851..353d5ab 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -101,7 +101,7 @@ RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE This changes SCons to better comply with normal Python installation practices. From Mats Wichmann: - - Recognize new java 9, 10 (as 9.0 and 10.0) + - Recognize new java 9, 10, 11 (as 9.0 and 10.0, 11.0) - Updated manpage scons.xml to fix a nested list problem - Updated doc terminiology: use prepend instead of append as appropriate - XML validity fixes from SConstruct.py change diff --git a/src/engine/SCons/Tool/JavaCommon.py b/src/engine/SCons/Tool/JavaCommon.py index 8349164..e90e768 100644 --- a/src/engine/SCons/Tool/JavaCommon.py +++ b/src/engine/SCons/Tool/JavaCommon.py @@ -69,7 +69,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', - '1.8', '5', '6', '9.0', '10.0'): + '1.8', '5', '6', '9.0', '10.0', '11.0'): msg = "Java version %s not supported" % version raise NotImplementedError(msg) @@ -177,7 +177,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', '1.8', '5', '6', '9.0', '10.0'): + elif self.version in ('1.5', '1.6', '1.7', '1.8', '5', '6', '9.0', '10.0', '11.0'): self.stackAnonClassBrackets.append(self.brackets) className = [] className.extend(self.listClasses) |