Changeset 46483 in vbox for trunk

Timestamp:

Jun 10, 2013 6:11:26 PM (12 years ago)

Author:

vboxsync

Message:

Main/webservice: properly resolve a couple of @todos

File:

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

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

@@ -171 +171 @@
 VBOXWEB_IDL_SRC               := $(VBOXWEB_OUT_DIR)/VirtualBox.xidl
 
-VBOXWEB_WSDL                   = $(VBOX_PATH_SDK)/bindings/webservice/vboxweb.wsdl
-VBOXWEBSERVICE_WSDL            = $(VBOX_PATH_SDK)/bindings/webservice/vboxwebService.wsdl
+VBOXWEB_WSDL                   = $(VBOXWEB_OUT_DIR)/vboxweb.wsdl
+VBOXWEBSERVICE_WSDL            = $(VBOXWEB_OUT_DIR)/vboxwebService.wsdl
 
 VBOXWEB_TYPEMAP               := $(VBOXWEB_OUT_DIR)/typemap.dat
@@ -565 +565 @@
         $(PATH_ROOT)/COPYING.LIB=>java/jax-ws/COPYING.LIB
 
+ INSTALLS += vboxwebinst_wsdl
+ vboxwebinst_wsdl_INST = $(INST_SDK)bindings/webservice/
+ vboxwebinst_wsdl_MODE = a+r,u+w
+ vboxwebinst_wsdl_SOURCES = \
+        $(VBOXWEB_WSDL)=>vboxweb.wsdl \
+        $(VBOXWEBSERVICE_WSDL)=>vboxwebService.wsdl
+
 endif # VBOX_ONLY_SDK
-
-## @todo VBOXWEB_WSDL and VBOXWEBSERVICE_WSDL should be an install target.
-VBOXWEB_OTHERS += \
-        $(VBOXWEB_WSDL) \
-        $(VBOXWEBSERVICE_WSDL)
 
 #
@@ -581 +583 @@
 OTHER_CLEAN += \
         $(VBOXWEB_OTHERS) \
+        $(VBOXWEB_WSDL) \
+        $(VBOXWEBSERVICE_WSDL) \
         $(VBOXWEB_TYPEMAP) \
         $(VBOXWEB_IDL_SRC)
@@ -591 +595 @@
 
 # generate WSDL from main XIDL file
-$(VBOXWEB_WSDL): $(VBOXWEB_IDL_SRC) $(VBOX_PATH_WEBSERVICE)/websrv-wsdl.xsl $(VBOX_PATH_IDL)/typemap-shared.inc.xsl $(RECOMPILE_ON_MAKEFILE_CURRENT) ## @todo | $$(dir $$@)
+$(VBOXWEB_WSDL): $(VBOXWEB_IDL_SRC) $(VBOX_PATH_WEBSERVICE)/websrv-wsdl.xsl $(VBOX_PATH_IDL)/typemap-shared.inc.xsl $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
         $(call MSG_GENERATE,,$@,$(VBOXWEB_IDL_SRC) using websrv-wsdl.xsl)
         $(QUIET)$(RM) -f -- $@
-        $(QUIET)$(MKDIR) -p $(@D)
         $(QUIET)$(VBOX_XSLTPROC) $(VBOXWEB_XSLTPROC_VERBOSE) -o $@ $(VBOX_PATH_WEBSERVICE)/websrv-wsdl.xsl $<
 
-$(VBOXWEBSERVICE_WSDL): $(VBOXWEB_IDL_SRC) $(VBOX_PATH_WEBSERVICE)/websrv-wsdl-service.xsl $(VBOX_PATH_IDL)/typemap-shared.inc.xsl $(RECOMPILE_ON_MAKEFILE_CURRENT) ## @todo | $$(dir $$@)
+$(VBOXWEBSERVICE_WSDL): $(VBOXWEB_IDL_SRC) $(VBOX_PATH_WEBSERVICE)/websrv-wsdl-service.xsl $(VBOX_PATH_IDL)/typemap-shared.inc.xsl $(RECOMPILE_ON_MAKEFILE_CURRENT) $$(dir $$@)
         $(call MSG_GENERATE,,$@,$(VBOXWEB_IDL_SRC) using websrv-wsdl-service.xsl)
         $(QUIET)$(RM) -f -- $@
-        $(QUIET)$(MKDIR) -p $(@D)
         $(QUIET)$(VBOX_XSLTPROC) $(VBOXWEB_XSLTPROC_VERBOSE) -o $@ $(VBOX_PATH_WEBSERVICE)/websrv-wsdl-service.xsl $<