OpenJDK / amber / amber
changeset 34070:792098bae87e
8085822: JEP 223: New Version-String Scheme (initial integration)
Reviewed-by: erikj, dcubed, dholmes, alanb
Contributed-by: Kumar Srinivasan <kumar.x.srinivasan@oracle.com>, Magnus Ihse Bursie <magnus.ihse.bursie@oracle.com>
| author | ihse |
|---|---|
| date | Thu, 11 Jun 2015 00:23:18 +0200 |
| parents | 56166ce66037 |
| children | 654e1a23e215 |
| files | langtools/make/gensrc/GensrcCommon.gmk langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java langtools/test/tools/javac/options/modes/InfoOptsTest.java langtools/test/tools/javac/options/modes/SourceTargetTest.java |
| diffstat | 4 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/langtools/make/gensrc/GensrcCommon.gmk Wed Jul 05 20:36:16 2017 +0200 +++ b/langtools/make/gensrc/GensrcCommon.gmk Thu Jun 11 00:23:18 2015 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -50,7 +50,7 @@ define SetupVersionProperties $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/$$(strip $2): $(MKDIR) -p $$(@D) - $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" \ + $(PRINTF) "jdk=$(VERSION_NUMBER)\nfull=$(VERSION_STRING)\nrelease=$(VERSION_SHORT)\n" \ > $$@ $$(strip $1) += $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/$$(strip $2) @@ -68,7 +68,7 @@ # Convert .../src/<module>/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties # to .../langtools/gensrc/<module>/com/sun/tools/javac/resources/javac_zh_CN.java - # Strip away prefix and suffix, leaving for example only: + # Strip away prefix and suffix, leaving for example only: # "<module>/share/classes/com/sun/tools/javac/resources/javac_zh_CN" PROPJAVAS := $$(patsubst $(LANGTOOLS_TOPDIR)/src/%, \ $(SUPPORT_OUTPUTDIR)/gensrc/%, \
--- a/langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java Wed Jul 05 20:36:16 2017 +0200 +++ b/langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java Thu Jun 11 00:23:18 2015 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -168,7 +168,7 @@ String specVersion = System.getProperty("java.specification.version"); switch (specVersion) { - case "1.9": + case "9": return RELEASE_9; case "1.8": return RELEASE_8;
--- a/langtools/test/tools/javac/options/modes/InfoOptsTest.java Wed Jul 05 20:36:16 2017 +0200 +++ b/langtools/test/tools/javac/options/modes/InfoOptsTest.java Thu Jun 11 00:23:18 2015 +0200 @@ -48,7 +48,7 @@ String specVersion = System.getProperty("java.specification.version"); testInfoOpt("-version", "javac", specVersion); - testInfoOpt("-fullversion", "javac", specVersion, "-b"); + testInfoOpt("-fullversion", "javac", specVersion, "+"); } void testInfoOpt(String opt, String... expect) {
--- a/langtools/test/tools/javac/options/modes/SourceTargetTest.java Wed Jul 05 20:36:16 2017 +0200 +++ b/langtools/test/tools/javac/options/modes/SourceTargetTest.java Thu Jun 11 00:23:18 2015 +0200 @@ -45,7 +45,10 @@ @Test void testSourceTarget() throws IOException { String v = System.getProperty("java.specification.version"); - String latest = v.substring(v.lastIndexOf(".") + 1); + String[] va = v.split("\\."); + int major = Integer.parseInt(va[0]); + boolean newVersion = major > 8; + String latest = (newVersion) ? va[0] : va[1]; String prev = String.valueOf(Integer.valueOf(latest) - 1); writeFile("C.java", "class C { }");