Changeset 21730 in vbox for trunk/src

Timestamp:

Jul 20, 2009 4:48:08 PM (16 years ago)

Author:

vboxsync

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

50303

Message:

SDK: make documentation match reality, minor refactoring

Location:

trunk/src/VBox

Files:

• Installer/Makefile.kmk (modified) (1 diff)
• Main/Makefile.kmk (modified) (2 diffs)
• Main/glue/vboxapi.py (modified) (3 diffs)
• Main/webservice/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Installer/Makefile.kmk

@@ -39 +39 @@
   include $(PATH_SUB_CURRENT)/win/Makefile.kmk
  endif
- include $(PATH_SUB_CURRENT)/common/Makefile.kmk
 endif
+
+include $(PATH_SUB_CURRENT)/common/Makefile.kmk
 
 if defined(VBOX_ONLY_SDK) ## @todo || defined(VBOX_WITH_SDK)

trunk/src/VBox/Main/Makefile.kmk

@@ -163 +163 @@
 ifdef VBOX_WITH_PYTHON
 
+# or to some subdir?
+VBOX_PYTHON_CONSTANTS = $(PATH_TARGET)/VirtualBox_constants.py
+
 INSTALLS += VBox-python-glue
 VBox-python-glue_INST = $(INST_SDK)installer
-# This file also should go to Python site-wide modules directory
-# so for users it look 'just being here'
-VBox-python-glue_SOURCES = glue/vboxapi.py=>vboxapi/__init__.py
-
-VBOX_PYTHON_CONSTANTS = $(VBOX_PATH_SDK)/installer/vboxapi/VirtualBox_constants.py
-OTHERS += $(VBOX_PYTHON_CONSTANTS)
+VBox-python-glue_SOURCES = glue/vboxapi.py=>vboxapi/__init__.py  \
+                           $(VBOX_PYTHON_CONSTANTS)=>vboxapi/VirtualBox_constants.py
+
+$(VBOX_PYTHON_CONSTANTS):  $(VBOX_PATH_MAIN_SRC)/glue/constants-python.xsl $(VBOX_XIDL_FILE) | $$(dir $$@)
+        $(call MSG_TOOL,xsltproc,Python constants,$<,$@)
+        $(QUIET)$(VBOX_XSLTPROC) -o $@ $< $(VBOX_XIDL_FILE)
 
 endif # VBOX_WITH_PYTHON
@@ -763 +766 @@
         $(QUIET)$(VBOX_XSLTPROC) -o $@ $< $(VBOX_XIDL_FILE)
 
-$(VBOX_PYTHON_CONSTANTS):  $(VBOX_PATH_MAIN_SRC)/glue/constants-python.xsl $(VBOX_XIDL_FILE) | $$(dir $$@)
-        $(call MSG_TOOL,xsltproc,Python constants,$<,$@)
-        $(QUIET)$(VBOX_XSLTPROC) -o $@ $< $(VBOX_XIDL_FILE)
-
 # Aliases for testing purposes.
 ifdef VBOX_WITH_XPCOM

trunk/src/VBox/Main/glue/vboxapi.py

@@ -25 +25 @@
 
 if VboxSdkDir is None:
-    VboxSdkDir = VboxBinDir+"/sdk"
+    VboxSdkDir = os.path.join(VboxBinDir,"sdk")
 
 os.environ["VBOX_PROGRAM_PATH"] = VboxBinDir
@@ -378 +378 @@
 class PlatformWEBSERVICE:
     def __init__(self, params):
-        sys.path.append(VboxSdkDir+'/bindings/webservice/python/lib')
+        sys.path.append(os.path.join(VboxSdkDir,'bindings', 'webservice', 'python', 'lib'))
         # not really needed, but just fail early if misconfigured
         import VirtualBox_services
         import VirtualBox_wrappers
         from VirtualBox_wrappers import IWebsessionManager2
+
         if params is not None:
             self.user = params.get("user", "")
@@ -472 +473 @@
             else:
                 style = "XPCOM"
+        
+        exec "self.platform = Platform"+style+"(platparams)"
+            
+        self.constants = VirtualBoxReflectionInfo()
+        self.type = self.platform.getType()
+        self.remote = self.platform.getRemote()
+        self.style = style 
+        self.mgr = SessionManager(self)
+        
         try:
-            exec "self.platform = Platform"+style+"(platparams)"
-            
-            self.constants = VirtualBoxReflectionInfo()
-            self.type = self.platform.getType()
-            self.remote = self.platform.getRemote()
-            self.style = style            
-
-            self.mgr = SessionManager(self)
             self.vbox = self.platform.getVirtualBox()
+        except NameError,ne:
+            print "Installation problem: check that appropriate libs in place"
+            traceback.print_exc()
+            raise ne
         except Exception,e:
             print "init exception: ",e

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

@@ -448 +448 @@
         $(QUIET)$(MKDIR) -p $(@D)
 # Try both w/o and with --file option
-        $(QUIET)$(REDIRECT) -C $(@D) -- $(VBOX_WSDL2PY) -b $(VBOXWEBSERVICE_WSDL) || $(VBOX_WSDL2PY) -b  --file $(VBOXWEBSERVICE_WSDL)
+        $(QUIET)$(REDIRECT) -C $(@D) -- bash -c "$(VBOX_WSDL2PY) -b $(VBOXWEBSERVICE_WSDL) || $(VBOX_WSDL2PY) -b  --file $(VBOXWEBSERVICE_WSDL)"
         $(QUIET)$(APPEND) $@ ''
 
@@ -596 +596 @@
         $(QUIET)$(CP) -f $(VBOX_PATH_WEBSERVICE)/../../../../COPYING.LIB $(VBOXWEB_PATH_SDK_GLUE_JAVA)
 
-$(VBOXWEB_JAVA15_JAR): $(VBOXWEB_GLUE_JAVA_TMP) $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_WSDL)
+$(VBOXWEB_GLUE_JAVA_TMP).done: $(VBOXWEB_GLUE_JAVA_TMP)
+        $(QUIET)$(APPEND) $@ ''
+
+$(VBOXWEB_JAVA15_JAR): $(VBOXWEB_GLUE_JAVA_TMP).done $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_WSDL)
         $(QUIET)$(RM) -Rf $(VBOXWEB_JAVALIB)/gen15
         $(QUIET)$(MKDIR) -p $(VBOXWEB_JAVALIB)/gen15
@@ -610 +613 @@
         $(QUIET)$(VBOX_JAR) cf $@ -C $(VBOXWEB_JAVALIB)/gen15 .
 
-$(VBOXWEB_JAVA16_JAR): $(VBOXWEB_GLUE_JAVA_TMP) $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_WSDL)
+$(VBOXWEB_JAVA16_JAR): $(VBOXWEB_GLUE_JAVA_TMP).done $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_WSDL)
         $(QUIET)$(RM) -Rf $(VBOXWEB_JAVALIB)/gen16
         $(MKDIR) -p $(VBOXWEB_JAVALIB)/gen16