Changeset 73315 in vbox

Timestamp:

Jul 23, 2018 11:28:20 AM (7 years ago)

Author:

vboxsync

Message:

Config.kmk: Deal with javac version 10: prints version to stdout (older versions used stderr), and dropped support for Java 1.5 source and target options.

File:

• trunk/Config.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -2711 +2711 @@
         $(VBOX_JAVA_HOME)/include/$(VBOX_MD_OS)
 endif # !darwin
-VBOX_JAVA_FIGURE_VERSION = $(shell $(1) -version 2>&1 > /dev/null \
+VBOX_JAVA_FIGURE_VERSION = $(shell $(1) -version 2>&1 \
         | $(SED_EXT) -n -e 's|^[^ ]* *\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$(DOLLAR)|$$(expr \1 * 10000 + \2 * 100 + \3)|p' )
 
@@ -7381 +7381 @@
  VBOX_JAVA_WS_OPTS ?= --add-modules java.xml.ws
 endif
-VBOX_JAVAC_OPTS   = -encoding UTF-8 -source 1.5 -target 1.5 -Xlint:unchecked
+if defined(VBOX_JAVA_VERSION) && $(VBOX_JAVA_VERSION) >= 100000
+ VBOX_JAVAC_OPTS   = -encoding UTF-8 -source 6 -target 6 -Xlint:unchecked
+else
+ VBOX_JAVAC_OPTS   = -encoding UTF-8 -source 1.5 -target 1.5 -Xlint:unchecked
+endif
 VBOX_JAVADOC_OPTS = -encoding UTF-8