Changeset 19853 in vbox for trunk

Timestamp:

May 20, 2009 10:42:58 AM (16 years ago)

Author:

vboxsync

Message:

SDK: refactoring Python samples

Location:

trunk/src

Files:

• VBox/Frontends/Makefile.kmk (modified) (1 diff)
• VBox/Frontends/VBoxShell/Makefile.kmk (added)
• VBox/Frontends/VBoxShell/mscom (deleted)
• VBox/Frontends/VBoxShell/ws (deleted)
• VBox/Frontends/VBoxShell/xpcom (deleted)
• VBox/Main/Makefile.kmk (modified) (3 diffs)
• VBox/Main/webservice/Makefile.kmk (modified) (2 diffs)
• VBox/Makefile.kmk (modified) (1 diff)
• libs/xpcom18a4/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Frontends/Makefile.kmk

@@ -45 +45 @@
 endif # !VBOX_ONLY_DOCS
 
+# @todo: include Python shell into binary delivery?
+ifdef VBOX_ONLY_SDK
+ include $(PATH_SUB_CURRENT)/VBoxShell/Makefile.kmk
+endif
+
 include $(KBUILD_PATH)/subfooter.kmk
 

trunk/src/VBox/Main/Makefile.kmk

@@ -88 +88 @@
         $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h \
         $(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox.tlb \
-        $(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox_i.c \
-        $(VBOX_PATH_SDK)/bindings/mscom/python/samples/vboxshell.py   \
-        $(VBOX_PATH_SDK)/bindings/mscom/python/samples/shellcommon.py
+        $(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox_i.c 
  OTHER_CLEAN    += \
         $(VBOX_IDL_FILE.MSCOM) \
@@ -98 +96 @@
         $(PATH_VBoxCOM)/VirtualBox.h   \
         $(PATH_VBoxCOM)/VirtualBox_i.c \
-        $(PATH_VBoxCOM)/VirtualBox.tlb \
-        $(VBOX_PATH_SDK)/bindings/mscom/python/samples/vboxshell.py \
-        $(VBOX_PATH_SDK)/bindings/mscom/python/samples/shellcommon.py
+        $(PATH_VBoxCOM)/VirtualBox.tlb 
 
  VBOX_MAIN_PREREQS += $(PATH_VBoxCOM)/VirtualBox_i.c
@@ -758 +754 @@
         $(CP) $(PATH_VBoxCOM)/VirtualBox_i.c $(VBOX_PATH_SDK)/bindings/mscom/lib
 
-
-## @todo Use install targets, please.
-#        Actually, what on earth is this stuff doing? Why copy two files like this?
-$(VBOX_PATH_SDK)/bindings/mscom/python/samples/shellcommon.py \
-+ $(VBOX_PATH_SDK)/bindings/mscom/python/samples/vboxshell.py: \
-                $(PATH_ROOT)/src/VBox/Frontends/VBoxShell/shellcommon.py \
-                $(PATH_ROOT)/src/VBox/Frontends/VBoxShell/mscom/vboxshell.py
-        $(MKDIR) -p $(VBOX_PATH_SDK)/bindings/mscom/python/samples
-        $(CP) $(PATH_ROOT)/src/VBox/Frontends/VBoxShell/shellcommon.py     $(VBOX_PATH_SDK)/bindings/mscom/python/samples/shellcommon.py
-        $(CP) $(PATH_ROOT)/src/VBox/Frontends/VBoxShell/mscom/vboxshell.py $(VBOX_PATH_SDK)/bindings/mscom/python/samples/vboxshell.py
-
 #
 # Translation stuff

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

@@ -372 +372 @@
         $(VBOXWEB_WS_PERL) \
         $(VBOXWEB_PYTHONWSSAMPLE)\
-        $(VBOXWEB_SHELLCOMMON) \
         $(VBOXWEB_JAXWSSAMPLE) \
         $(VBOXWEB_METRICSAMPLE) \
@@ -390 +389 @@
       samples/perl/clienttest.pl=>perl/samples/clienttest.pl \
       samples/python/Makefile=>python/samples/Makefile \
-      samples/python/Makefile.glue=>python/lib/Makefile \
-      $(PATH_ROOT)/src/VBox/Frontends/VBoxShell/ws/vboxshell.py=>python/samples/vboxshell.py \
-      $(PATH_ROOT)/src/VBox/Frontends/VBoxShell/shellcommon.py=>python/samples/shellcommon.py
+      samples/python/Makefile.glue=>python/lib/Makefile
 
  #

trunk/src/VBox/Makefile.kmk

@@ -45 +45 @@
  endif
  include $(PATH_SUB_CURRENT)/Installer/Makefile.kmk
+ include $(PATH_SUB_CURRENT)/Frontends/Makefile.kmk
 
 else

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -1392 +1392 @@
  endif
  INSTALLS += VBoxPython-inst-py-xpcom
- INSTALLS += VBoxPython-inst-sample
 endif
 
@@ -1469 +1468 @@
         python/server/module.py=>server/module.py \
         python/server/policy.py=>server/policy.py
-
-# Python Client Module - a sample script.
-VBoxPython-inst-sample_INST = $(INST_SDK)bindings/xpcom/python/sample/
-VBoxPython-inst-sample_SOURCES = \
-        $(PATH_ROOT)/src/VBox/Frontends/VBoxShell/xpcom/vboxshell.py \
-        $(PATH_ROOT)/src/VBox/Frontends/VBoxShell/shellcommon.py
 
 #