make/common/SetupJavaCompilers.gmk

*** 1,7 ****
  #
! # Copyright (c) 2011, 2017, 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
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2011, 2018, 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
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 70,90 ****
  # The generate new bytecode javac setup uses the new compiler to compile for the
  # new jdk. This new bytecode might only be possible to run using the new jvm.
  $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE, \
      JVM := $(JAVA_JAVAC), \
      JAVAC := $(NEW_JAVAC), \
!     FLAGS := -source 11 -target 11 --doclint-format html5 \
          -encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS), \
      SERVER_DIR := $(SJAVAC_SERVER_DIR), \
      SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
  
  # The generate new bytecode javac setup uses the new compiler to compile for the
  # new jdk. This new bytecode might only be possible to run using the new jvm.
  $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE_NOWARNINGS, \
      JVM := $(JAVA_JAVAC), \
      JAVAC := $(NEW_JAVAC), \
!     FLAGS := -source 11 -target 11 \
          -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS), \
      SERVER_DIR := $(SJAVAC_SERVER_DIR), \
      SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
  
  # After the jdk is built, we want to build demos using only the recently
--- 70,90 ----
  # The generate new bytecode javac setup uses the new compiler to compile for the
  # new jdk. This new bytecode might only be possible to run using the new jvm.
  $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE, \
      JVM := $(JAVA_JAVAC), \
      JAVAC := $(NEW_JAVAC), \
!     FLAGS := -source 12 -target 12 --doclint-format html5 \
          -encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS), \
      SERVER_DIR := $(SJAVAC_SERVER_DIR), \
      SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
  
  # The generate new bytecode javac setup uses the new compiler to compile for the
  # new jdk. This new bytecode might only be possible to run using the new jvm.
  $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE_NOWARNINGS, \
      JVM := $(JAVA_JAVAC), \
      JAVAC := $(NEW_JAVAC), \
!     FLAGS := -source 12 -target 12 \
          -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS), \
      SERVER_DIR := $(SJAVAC_SERVER_DIR), \
      SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
  
  # After the jdk is built, we want to build demos using only the recently