Changeset 71822 in vbox for trunk/src/VBox/Main/webservice

Timestamp:

Apr 11, 2018 12:22:31 PM (7 years ago)

Author:

vboxsync

Message:

Config.kmk, Main/webservice: add javac version detection (needed reshuffling), and use it for passing the --add-modules option for the webservice stuff with JDK8 and later

File:

• trunk/src/VBox/Main/webservice/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Main/webservice/Makefile.kmk

@@ -481 +481 @@
         $(QUIET)$(MKDIR) -p $(VBOX_JWS_JDEST)
         $(call MSG_L1,Compiling bridge code)
-        $(VBOX_JAVAC) $(VBOX_JAVAC_OPTS) \
+        $(VBOX_JAVAC) $(VBOX_JAVAC_OPTS) $(VBOX_JAVA_WS_OPTS) \
                 @$(VBOX_JWS_GEN)/jwsglue.list \
                 -d $(VBOX_JWS_JDEST) -classpath $(VBOX_JWS_JDEST)
@@ -504 +504 @@
         $(QUIET)$(MKDIR) -p $(VBOX_JWSDOC_JDEST)
         $(call MSG_L1,Generating javadoc html documentation)
-        $(VBOX_JAVADOC) $(VBOX_JAVADOC_OPTS) -quiet \
+        $(VBOX_JAVADOC) $(VBOX_JAVADOC_OPTS) $(VBOX_JAVA_WS_OPTS) -quiet \
                 -sourcepath $(VBOX_JWS_GEN)/java org.virtualbox$(VBOX_API_SUFFIX) \
                 -d $(VBOX_JWSDOC_JDEST)