- Timestamp:
- Jan 31, 2019 10:53:31 AM (6 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
-
Config.kmk (modified) (2 diffs)
-
src/VBox/Main/webservice/Makefile.kmk (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r77055 r77066 2770 2770 VBOX_JAR = "$(VBOX_JAVA_HOME)/bin/jar$(HOSTSUFF_EXE)" 2771 2771 VBOX_JAVADOC = "$(VBOX_JAVA_HOME)/bin/javadoc$(HOSTSUFF_EXE)" 2772 VBOX_WSIMPORT = "$(VBOX_JAVA_HOME)/bin/wsimport$(HOSTSUFF_EXE)" 2772 # With Java 11 wsimport was removed, usually part of a separate install now. 2773 VBOX_WSIMPORT = $(firstword $(wildcard "$(VBOX_JAVA_HOME)/bin/wsimport$(HOSTSUFF_EXE)") wsimport$(HOSTSUFF_EXE)) 2773 2774 # correct for targets we care about 2774 2775 VBOX_MD_OS = $(KBUILD_TARGET) … … 7748 7749 if defined(VBOX_JAVA_VERSION) && $(VBOX_JAVA_VERSION) >= 110000 7749 7750 VBOX_JAVA_WS_PATH ?= /usr/share/java 7750 VBOX_JAVA_WS_ OPTS ?= -classpath $(VBOX_JAVA_WS_PATH)/jws-api.jar:$(VBOX_JAVA_WS_PATH)/jaxb-api.jar:$(VBOX_JAVA_WS_PATH)/jaxws-api.jar7751 VBOX_JAVA_WS_EXTRA_JARS ?= $(VBOX_JAVA_WS_PATH)/jws-api.jar$(VBOX_SEP)$(VBOX_JAVA_WS_PATH)/jaxb-api.jar$(VBOX_SEP)$(VBOX_JAVA_WS_PATH)/jaxws-api.jar 7751 7752 else if defined(VBOX_JAVA_VERSION) && $(VBOX_JAVA_VERSION) >= 10900 7752 7753 VBOX_JAVA_WS_OPTS ?= --add-modules java.xml.ws -
trunk/src/VBox/Main/webservice/Makefile.kmk
r76553 r77066 481 481 $(VBOX_JAVAC) $(VBOX_JAVAC_OPTS) $(VBOX_JAVA_WS_OPTS) \ 482 482 @$(VBOX_JWS_GEN)/jwsglue.list \ 483 -d $(VBOX_JWS_JDEST) -classpath $(VBOX_JWS_JDEST) 483 -d $(VBOX_JWS_JDEST) -classpath $(VBOX_JWS_JDEST)$(VBOX_SEP)$(VBOX_JAVA_WS_EXTRA_JARS) 484 484 $(QUIET)$(SED) -e "s/vboxweb.wsdl/vboxweb$(VBOX_API_SUFFIX).wsdl/" < $(VBOXWEBSERVICE_WSDL) > $(VBOX_JWS_JDEST)/vboxwebService$(VBOX_API_SUFFIX).wsdl 485 485 $(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 \ 505 505 -sourcepath $(VBOX_JWS_GEN)/java org.virtualbox$(VBOX_API_SUFFIX) \ 506 -d $(VBOX_JWSDOC_JDEST) 506 -d $(VBOX_JWSDOC_JDEST) -classpath $(VBOX_SEP)$(VBOX_JAVA_WS_EXTRA_JARS) 507 507 $(call MSG_LINK,$(notdir $@),$@) 508 508 $(VBOX_JAR) cf $@ -C $(VBOX_JWSDOC_JDEST) .
Note:
See TracChangeset
for help on using the changeset viewer.

