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

Timestamp:

Jan 31, 2019 10:53:31 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

128516

Message:

Config.kmk, webservice/Makefile.kmk: more Java webservice fixing for Java 11 (cannot put -classpath in VBOX_JAVA_WS_OPTS since it would be overridden by the later option), and prepare for wsimport being hopefully in the search path, if it's not included in Java.

File:

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

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

@@ -481 +481 @@
         $(VBOX_JAVAC) $(VBOX_JAVAC_OPTS) $(VBOX_JAVA_WS_OPTS) \
                 @$(VBOX_JWS_GEN)/jwsglue.list \
-                -d $(VBOX_JWS_JDEST) -classpath $(VBOX_JWS_JDEST)
+                -d $(VBOX_JWS_JDEST) -classpath $(VBOX_JWS_JDEST)$(VBOX_SEP)$(VBOX_JAVA_WS_EXTRA_JARS)
         $(QUIET)$(SED) -e "s/vboxweb.wsdl/vboxweb$(VBOX_API_SUFFIX).wsdl/" <  $(VBOXWEBSERVICE_WSDL) > $(VBOX_JWS_JDEST)/vboxwebService$(VBOX_API_SUFFIX).wsdl
         $(QUIET)$(CP) -f $(VBOXWEB_WSDL) $(VBOX_JWS_JDEST)/vboxweb$(VBOX_API_SUFFIX).wsdl
@@ -504 +504 @@
         $(VBOX_JAVADOC) $(VBOX_JAVADOC_OPTS) $(VBOX_JAVA_WS_OPTS) -quiet \
                 -sourcepath $(VBOX_JWS_GEN)/java org.virtualbox$(VBOX_API_SUFFIX) \
-                -d $(VBOX_JWSDOC_JDEST)
+                -d $(VBOX_JWSDOC_JDEST) -classpath $(VBOX_SEP)$(VBOX_JAVA_WS_EXTRA_JARS)
         $(call MSG_LINK,$(notdir $@),$@)
         $(VBOX_JAR) cf $@ -C $(VBOX_JWSDOC_JDEST) .