Changeset 63941 in vbox

Timestamp:

Sep 22, 2016 8:56:14 AM (8 years ago)

Author:

vboxsync

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

110827

Message:

Main/webservice: need to keep the hack to try both with and without --file

File:

• trunk/src/VBox/Main/webservice/Makefile.kmk (modified) (1 diff)

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

@@ -672 +672 @@
         $(QUIET)$(MKDIR) -p $(@D)
 # Change directory to the "source", as otherwise ZSI 2.0 has trouble finding
-# the 2nd WSDL file included in the main one. ZSI 2.1 is smarter.
+# the 2nd WSDL file included in the main one. ZSI 2.1 is smarter, but some
+# versions floating around (especially on Linux) lack the --file option.
 if "$(KBUILD_HOST)" != "win"
-        $(QUIET)$(REDIRECT) -C $(dir $(VBOXWEBSERVICE_WSDL)) -- $(VBOX_WSDL2PY) -b --file $(VBOXWEBSERVICE_WSDL) --output-dir $(@D)
+        $(QUIET)$(REDIRECT) -C $(dir $(VBOXWEBSERVICE_WSDL)) -- $(SHELL) -c "$(VBOX_WSDL2PY) -b --output-dir $(@D) $(VBOXWEBSERVICE_WSDL) || $(VBOX_WSDL2PY) -b --file $(VBOXWEBSERVICE_WSDL) --output-dir $(@D)"
 else
         $(QUIET)$(REDIRECT) -C $(dir $(VBOXWEBSERVICE_WSDL)) -- $(VBOX_WSDL2PY) -b --file $(subst /,\\\\,$(VBOXWEBSERVICE_WSDL)) --output-dir $(@D)