Changeset 59491 in vbox

Timestamp:

Jan 27, 2016 12:37:34 PM (9 years ago)

Author:

vboxsync

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

105259

Message:

Main/webservice: Drop Python ZSI 1.x backwards compatibility. It is long obsolete (ZSI 2.0 has been released 2007) and requires very non-obvious tricks in the build system.

Location:

trunk/src/VBox/Main/webservice

Files:

• Makefile.kmk (modified) (5 diffs)
• websrv-python.xsl (modified) (1 diff)

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

@@ -529 +529 @@
  #
  VBOXWEB_GLUE_PYTHON           = $(VBOX_PATH_SDK)/bindings/webservice/python/lib/VirtualBox_wrappers.py
- VBOXWEB_WS_PYTHON             = $(VBOX_PATH_SDK)/bindings/webservice/python/lib/VirtualBox_services.py
+ # The following 3 files are generated by Python ZSI 2.0 which was released
+ # in 2007. ZSI 1.x used different file names. Not worth supporting any more.
+ # If you're curious, check the VirtualBox 4.3 sources.
+ VBOXWEB_WS_PYTHON             = $(VBOX_PATH_SDK)/bindings/webservice/python/lib/VirtualBox_client.py
+ VBOXWEB_WS_PYTHON_TYPES       = $(VBOX_PATH_SDK)/bindings/webservice/python/lib/VirtualBox_types.py
+ VBOXWEB_WS_PYTHON_SERVER      = $(VBOX_PATH_SDK)/bindings/webservice/python/lib/VirtualBox_server.py
  VBOXWEB_WS_PERL               = $(VBOX_PATH_SDK)/bindings/webservice/perl/lib/vboxService.pm
  VBOXWEB_WS_PHP                = $(VBOX_PATH_SDK)/bindings/webservice/php/lib/vboxServiceWrappers.php
@@ -543 +548 @@
         $(if $(VBOX_WITH_PYTHON),$(VBOXWEB_GLUE_PYTHON),)       \
         $(if $(VBOX_WITH_PYTHON),$(VBOXWEB_WS_PYTHON),)         \
+        $(if $(VBOX_WITH_PYTHON),$(VBOXWEB_WS_PYTHON_TYPES),)   \
         $(if $(VBOX_WITH_PERL),$(VBOXWEB_WS_PERL),)             \
         $(if $(VBOX_WITH_PHP),$(VBOXWEB_WS_PHP),)               \
@@ -585 +591 @@
 OTHER_CLEAN += \
         $(VBOXWEB_OTHERS) \
+        $(if $(VBOX_WITH_PYTHON),$(VBOXWEB_WS_PYTHON_SERVER),)  \
         $(VBOXWEB_WSDL) \
         $(VBOXWEBSERVICE_WSDL) \
@@ -615 +622 @@
         $(QUIET)$(VBOX_XSLTPROC) $(VBOXWEB_XSLTPROC_VERBOSE) -o $@ $(VBOX_PATH_WEBSERVICE)/websrv-python.xsl $<
 
-$(VBOXWEB_WS_PYTHON): $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_WSDL)
+$(VBOXWEB_WS_PYTHON) \
++ $(VBOXWEB_WS_PYTHON_TYPES): $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_WSDL)
         $(call MSG_GENERATE,,$@, WS Python bindings)
         $(QUIET)$(RM) -f -- $@
@@ -621 +629 @@
 # Try both w/o and with --file option
         $(QUIET)$(REDIRECT) -C $(@D) -- $(SHELL) -c "$(VBOX_WSDL2PY) -b $(VBOXWEBSERVICE_WSDL) || $(VBOX_WSDL2PY) -b  --file $(VBOXWEBSERVICE_WSDL)"
-# Note: the previous command (depending on the version) may or may not create
-# $@, but the Python webservice bindings in the SDK depend on its presence.
+# We do not ever need the VirtualBox_server.py file. Delete it immediatelyi
+# so that it will not get packaged in the SDK.
+        $(QUIET)$(RM) -f -- $(VBOXWEB_WS_PYTHON_SERVER)
         $(QUIET)$(APPEND) $@ ''
 

trunk/src/VBox/Main/webservice/websrv-python.xsl

@@ -491 +491 @@
 # This file is autogenerated from VirtualBox.xidl, DO NOT EDIT!
 #
-from VirtualBox_services import *
-
-try:
-  from VirtualBox_client import *
-except:
-  pass
+
+# Works only with ZSI 2.0 generated stubs (part of the VirtualBox SDK).
+from VirtualBox_client import *
 
 class ManagedManager: