272 lines
11 KiB
Diff
272 lines
11 KiB
Diff
diff -Naur openjdk.orig/corba/make/common/shared/Defs-java.gmk openjdk/corba/make/common/shared/Defs-java.gmk
|
|
--- openjdk.orig/corba/make/common/shared/Defs-java.gmk 2016-12-29 23:29:55.000000000 -0500
|
|
+++ openjdk/corba/make/common/shared/Defs-java.gmk 2018-06-01 01:53:58.508434037 -0400
|
|
@@ -108,11 +108,11 @@
|
|
JAVACFLAGS += $(NO_PROPRIETARY_API_WARNINGS)
|
|
|
|
# Add the source level (currently all source is 1.5, should this be 1.6?)
|
|
-LANGUAGE_VERSION = -source 1.5
|
|
+LANGUAGE_VERSION = -source 1.6
|
|
JAVACFLAGS += $(LANGUAGE_VERSION)
|
|
|
|
# Add the class version we want (currently this is 5, should it be 6 or even 7?)
|
|
-TARGET_CLASS_VERSION = 5
|
|
+TARGET_CLASS_VERSION = 6
|
|
CLASS_VERSION = -target $(TARGET_CLASS_VERSION)
|
|
JAVACFLAGS += $(CLASS_VERSION)
|
|
JAVACFLAGS += -encoding ascii
|
|
@@ -179,8 +179,8 @@
|
|
ifeq ($(COMPILER_WARNINGS_FATAL), true)
|
|
BOOT_JAVACFLAGS += -Werror
|
|
endif
|
|
-BOOT_SOURCE_LANGUAGE_VERSION = 5
|
|
-BOOT_TARGET_CLASS_VERSION = 5
|
|
+BOOT_SOURCE_LANGUAGE_VERSION = 6
|
|
+BOOT_TARGET_CLASS_VERSION = 6
|
|
BOOT_JAVACFLAGS += -encoding ascii -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
|
|
|
|
BOOT_JAVA_CMD = $(BOOTDIR)/bin/java $(JAVA_TOOLS_FLAGS)
|
|
diff -Naur openjdk.orig/corba/make/Makefile openjdk/corba/make/Makefile
|
|
--- openjdk.orig/corba/make/Makefile 2016-12-29 23:29:54.000000000 -0500
|
|
+++ openjdk/corba/make/Makefile 2018-06-01 02:15:02.151450743 -0400
|
|
@@ -104,8 +104,8 @@
|
|
|
|
#----- useful macros
|
|
|
|
-SOURCE_LEVEL = 5
|
|
-BOOTSTRAP_TARGET_LEVEL = 5
|
|
+SOURCE_LEVEL = 6
|
|
+BOOTSTRAP_TARGET_LEVEL = 6
|
|
TARGET_LEVEL = 6
|
|
|
|
ifndef TARGET_JAVA
|
|
diff -Naur openjdk.orig/hotspot/make/linux/makefiles/rules.make openjdk/hotspot/make/linux/makefiles/rules.make
|
|
--- openjdk.orig/hotspot/make/linux/makefiles/rules.make 2016-12-29 23:31:09.000000000 -0500
|
|
+++ openjdk/hotspot/make/linux/makefiles/rules.make 2018-06-01 02:05:13.574442962 -0400
|
|
@@ -126,8 +126,8 @@
|
|
RUN.JAR$(MAKE_VERBOSE) += >/dev/null
|
|
|
|
# Settings for javac
|
|
-BOOT_SOURCE_LANGUAGE_VERSION = 5
|
|
-BOOT_TARGET_CLASS_VERSION = 5
|
|
+BOOT_SOURCE_LANGUAGE_VERSION = 6
|
|
+BOOT_TARGET_CLASS_VERSION = 6
|
|
JAVAC_FLAGS = -g -encoding ascii
|
|
BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
|
|
|
|
diff -Naur openjdk.orig/hotspot/make/solaris/makefiles/rules.make openjdk/hotspot/make/solaris/makefiles/rules.make
|
|
--- openjdk.orig/hotspot/make/solaris/makefiles/rules.make 2016-12-29 23:31:12.000000000 -0500
|
|
+++ openjdk/hotspot/make/solaris/makefiles/rules.make 2018-06-01 02:03:51.478441877 -0400
|
|
@@ -118,8 +118,8 @@
|
|
RUN.JAR$(MAKE_VERBOSE) += >/dev/null
|
|
|
|
# Settings for javac
|
|
-BOOT_SOURCE_LANGUAGE_VERSION = 5
|
|
-BOOT_TARGET_CLASS_VERSION = 5
|
|
+BOOT_SOURCE_LANGUAGE_VERSION = 6
|
|
+BOOT_TARGET_CLASS_VERSION = 6
|
|
JAVAC_FLAGS = -g -encoding ascii
|
|
BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
|
|
|
|
diff -Naur openjdk.orig/hotspot/make/windows/makefiles/rules.make openjdk/hotspot/make/windows/makefiles/rules.make
|
|
--- openjdk.orig/hotspot/make/windows/makefiles/rules.make 2016-12-29 23:31:13.000000000 -0500
|
|
+++ openjdk/hotspot/make/windows/makefiles/rules.make 2018-06-01 02:04:27.238442349 -0400
|
|
@@ -43,8 +43,8 @@
|
|
!endif
|
|
|
|
# Settings for javac
|
|
-BOOT_SOURCE_LANGUAGE_VERSION=5
|
|
-BOOT_TARGET_CLASS_VERSION=5
|
|
+BOOT_SOURCE_LANGUAGE_VERSION=6
|
|
+BOOT_TARGET_CLASS_VERSION=6
|
|
JAVAC_FLAGS=-g -encoding ascii
|
|
BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
|
|
|
|
diff -Naur openjdk.orig/hotspot/src/share/tools/LogCompilation/Makefile openjdk/hotspot/src/share/tools/LogCompilation/Makefile
|
|
--- openjdk.orig/hotspot/src/share/tools/LogCompilation/Makefile 2016-12-29 23:31:08.000000000 -0500
|
|
+++ openjdk/hotspot/src/share/tools/LogCompilation/Makefile 2018-06-01 01:28:36.013413909 -0400
|
|
@@ -62,7 +62,7 @@
|
|
|
|
logc.jar: filelist manifest.mf
|
|
@mkdir -p $(OUTPUT_DIR)
|
|
- $(JAVAC) -source 1.5 -deprecation -sourcepath $(SRC_DIR) -d $(OUTPUT_DIR) @filelist
|
|
+ $(JAVAC) -source 1.6 -deprecation -sourcepath $(SRC_DIR) -d $(OUTPUT_DIR) @filelist
|
|
$(JAR) cvfm logc.jar manifest.mf -C $(OUTPUT_DIR) com
|
|
|
|
.PHONY: filelist
|
|
diff -Naur openjdk.orig/jaxp/build.properties openjdk/jaxp/build.properties
|
|
--- openjdk.orig/jaxp/build.properties 2016-12-29 23:29:57.000000000 -0500
|
|
+++ openjdk/jaxp/build.properties 2018-06-01 02:35:05.161466648 -0400
|
|
@@ -39,8 +39,8 @@
|
|
tools.jar=${jdk.home}/lib/tools.jar
|
|
|
|
# options for the <javac> tasks used to compile the tools
|
|
-javac.source = 5
|
|
-javac.target = 5
|
|
+javac.source = 6
|
|
+javac.target = 6
|
|
javac.debug = true
|
|
javac.no.jdk.warnings = -XDignore.symbol.file=true
|
|
# set the following to -version to verify the versions of javac being used
|
|
diff -Naur openjdk.orig/jaxp/build.xml openjdk/jaxp/build.xml
|
|
--- openjdk.orig/jaxp/build.xml 2016-12-29 23:29:57.000000000 -0500
|
|
+++ openjdk/jaxp/build.xml 2018-06-01 02:39:13.053469925 -0400
|
|
@@ -44,10 +44,10 @@
|
|
</description>
|
|
|
|
<!-- Mac is special, need to downgrade these before build.properties. -->
|
|
- <condition property="javac.source" value="1.5">
|
|
+ <condition property="javac.source" value="1.6">
|
|
<os family="mac"/>
|
|
</condition>
|
|
- <condition property="javac.target" value="1.5">
|
|
+ <condition property="javac.target" value="1.6">
|
|
<os family="mac"/>
|
|
</condition>
|
|
|
|
diff -Naur openjdk.orig/jaxws/build.properties openjdk/jaxws/build.properties
|
|
--- openjdk.orig/jaxws/build.properties 2016-12-29 23:30:03.000000000 -0500
|
|
+++ openjdk/jaxws/build.properties 2018-06-01 02:50:40.742479017 -0400
|
|
@@ -39,8 +39,8 @@
|
|
tools.jar=${jdk.home}/lib/tools.jar
|
|
|
|
# options for the <javac> tasks used to compile the tools
|
|
-javac.source = 5
|
|
-javac.target = 5
|
|
+javac.source = 6
|
|
+javac.target = 6
|
|
javac.debug = true
|
|
javac.no.jdk.warnings = -XDignore.symbol.file=true
|
|
# set the following to -version to verify the versions of javac being used
|
|
diff -Naur openjdk.orig/jaxws/build.xml openjdk/jaxws/build.xml
|
|
--- openjdk.orig/jaxws/build.xml 2016-12-29 23:30:03.000000000 -0500
|
|
+++ openjdk/jaxws/build.xml 2018-06-01 02:51:14.112479458 -0400
|
|
@@ -44,10 +44,10 @@
|
|
</description>
|
|
|
|
<!-- Mac is special, need to downgrade these before build.properties. -->
|
|
- <condition property="javac.source" value="1.5">
|
|
+ <condition property="javac.source" value="1.6">
|
|
<os family="mac"/>
|
|
</condition>
|
|
- <condition property="javac.target" value="1.5">
|
|
+ <condition property="javac.target" value="1.6">
|
|
<os family="mac"/>
|
|
</condition>
|
|
|
|
diff -Naur openjdk.orig/jdk/make/common/shared/Defs-control.gmk openjdk/jdk/make/common/shared/Defs-control.gmk
|
|
--- openjdk.orig/jdk/make/common/shared/Defs-control.gmk 2016-12-29 23:30:21.000000000 -0500
|
|
+++ openjdk/jdk/make/common/shared/Defs-control.gmk 2018-06-01 02:03:00.034441197 -0400
|
|
@@ -80,7 +80,7 @@
|
|
dummy := $(shell $(MKDIR) -p $(TEMP_DIR))
|
|
|
|
# The class version we want for this jdk build
|
|
-TARGET_CLASS_VERSION=5
|
|
+TARGET_CLASS_VERSION=6
|
|
|
|
# The MESSAGE, WARNING and ERROR files are used to store sanity check and
|
|
# source check messages, warnings and errors.
|
|
diff -Naur openjdk.orig/jdk/make/common/shared/Defs-java.gmk openjdk/jdk/make/common/shared/Defs-java.gmk
|
|
--- openjdk.orig/jdk/make/common/shared/Defs-java.gmk 2016-12-29 23:30:21.000000000 -0500
|
|
+++ openjdk/jdk/make/common/shared/Defs-java.gmk 2018-06-01 01:55:59.237435633 -0400
|
|
@@ -120,11 +120,11 @@
|
|
JAVACFLAGS += $(JAVAC_LINT_OPTIONS)
|
|
|
|
# Add the source level (currently all source is 1.5, should this be 1.6?)
|
|
-LANGUAGE_VERSION = -source 1.5
|
|
+LANGUAGE_VERSION = -source 1.6
|
|
JAVACFLAGS += $(LANGUAGE_VERSION)
|
|
|
|
# Add the class version we want (currently this is 5, should it be 6 or even 7?)
|
|
-TARGET_CLASS_VERSION = 5
|
|
+TARGET_CLASS_VERSION = 6
|
|
CLASS_VERSION = -target $(TARGET_CLASS_VERSION)
|
|
JAVACFLAGS += $(CLASS_VERSION)
|
|
JAVACFLAGS += -encoding ascii
|
|
@@ -196,8 +196,8 @@
|
|
BOOT_JAVACFLAGS += -Werror
|
|
endif
|
|
|
|
-BOOT_SOURCE_LANGUAGE_VERSION = 5
|
|
-BOOT_TARGET_CLASS_VERSION = 5
|
|
+BOOT_SOURCE_LANGUAGE_VERSION = 6
|
|
+BOOT_TARGET_CLASS_VERSION = 6
|
|
BOOT_JAVACFLAGS += -encoding ascii -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
|
|
|
|
BOOT_JAVACFLAGS += $(NO_PROPRIETARY_API_WARNINGS)
|
|
diff -Naur openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
|
|
--- openjdk.orig/jdk/make/docs/Makefile 2016-12-29 23:30:21.000000000 -0500
|
|
+++ openjdk/jdk/make/docs/Makefile 2018-06-01 01:27:48.704413284 -0400
|
|
@@ -185,7 +185,7 @@
|
|
# Common javadoc options used by all
|
|
COMMON_JAVADOCFLAGS = \
|
|
$(NO_PROPRIETARY_API_WARNINGS) \
|
|
- -source 1.5 \
|
|
+ -source 1.6 \
|
|
-quiet \
|
|
-use \
|
|
-keywords \
|
|
diff -Naur openjdk.orig/langtools/make/build.properties openjdk/langtools/make/build.properties
|
|
--- openjdk.orig/langtools/make/build.properties 2016-12-29 23:30:07.000000000 -0500
|
|
+++ openjdk/langtools/make/build.properties 2018-06-01 02:22:26.791456622 -0400
|
|
@@ -32,8 +32,8 @@
|
|
# boot.java.home = /opt/jdk/1.5.0
|
|
boot.java = ${boot.java.home}/bin/java
|
|
boot.javac = ${boot.java.home}/bin/javac
|
|
-boot.javac.source = 5
|
|
-boot.javac.target = 5
|
|
+boot.javac.source = 6
|
|
+boot.javac.target = 6
|
|
|
|
# This is the JDK used to run the product version of the tools,
|
|
# for example, for testing. If you're building a complete JDK, specify that.
|
|
@@ -60,8 +60,8 @@
|
|
bootstrap.full.version = ${bootstrap.release}-${build.number}
|
|
|
|
# options for the <javac> tasks used to compile the tools
|
|
-javac.source = 5
|
|
-javac.target = 5
|
|
+javac.source = 6
|
|
+javac.target = 6
|
|
javac.debug = true
|
|
javac.debuglevel = source,lines
|
|
javac.no.jdk.warnings = -XDignore.symbol.file=true
|
|
diff -Naur openjdk.orig/langtools/make/build.xml openjdk/langtools/make/build.xml
|
|
--- openjdk.orig/langtools/make/build.xml 2016-12-29 23:30:07.000000000 -0500
|
|
+++ openjdk/langtools/make/build.xml 2018-06-01 02:09:58.577446730 -0400
|
|
@@ -608,7 +608,7 @@
|
|
<attribute name="name"/>
|
|
<attribute name="includes"/>
|
|
<attribute name="options" default=""/>
|
|
- <attribute name="source" default="1.5"/> <!-- FIXME -->
|
|
+ <attribute name="source" default="1.6"/> <!-- FIXME -->
|
|
<sequential>
|
|
<property name="javadoc.options" value=""/> <!-- default, can be overridden per user or per project -->
|
|
<!-- Note: even with this default value, includes
|
|
diff -Naur openjdk.orig/langtools/make/Makefile-classic openjdk/langtools/make/Makefile-classic
|
|
--- openjdk.orig/langtools/make/Makefile-classic 2016-12-29 23:30:07.000000000 -0500
|
|
+++ openjdk/langtools/make/Makefile-classic 2018-06-01 02:15:26.643451067 -0400
|
|
@@ -165,8 +165,8 @@
|
|
|
|
TOOLS = javac javadoc javah javap apt
|
|
|
|
-SOURCE_LEVEL = 5
|
|
-BOOTSTRAP_TARGET_LEVEL = 5
|
|
+SOURCE_LEVEL = 6
|
|
+BOOTSTRAP_TARGET_LEVEL = 6
|
|
TARGET_LEVEL = 6
|
|
|
|
ifndef TARGET_JAVA
|
|
diff -Naur openjdk.orig/langtools/make/netbeans/langtools/nbproject/project.xml openjdk/langtools/make/netbeans/langtools/nbproject/project.xml
|
|
--- openjdk.orig/langtools/make/netbeans/langtools/nbproject/project.xml 2016-12-29 23:30:07.000000000 -0500
|
|
+++ openjdk/langtools/make/netbeans/langtools/nbproject/project.xml 2018-06-01 02:24:04.235457910 -0400
|
|
@@ -101,7 +101,7 @@
|
|
<compilation-unit>
|
|
<package-root>${root}/src/share/classes</package-root>
|
|
<built-to>${root}/build/classes</built-to>
|
|
- <source-level>1.5</source-level> <!-- FIXME -->
|
|
+ <source-level>1.6</source-level> <!-- FIXME -->
|
|
</compilation-unit>
|
|
</java-data>
|
|
</configuration>
|