Changeset 11569 in vbox for trunk/src/libs

Timestamp:

Aug 22, 2008 12:11:00 PM (16 years ago)

Author:

vboxsync

Message:

rework of Python XPCOM to make it ready for production

File:

• trunk/src/libs/xpcom18a4/Makefile.kmk (modified) (6 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -43 +43 @@
 XPCOM_PYMOD = VBox-xpcom-pymod
 # VBox-xpcom-helper
-# bridge between PYMOD and VirtualBox, to minimize mods
+# bridge between host application and VirtualBox library, for embedded case
 XPCOM_VBOX_HELPER = VBox-xpcom-helper
+# XXX: to be defined in configure
 PYTHON_INCS=/usr/include/python2.5
 endif
@@ -274 +275 @@
         VBox-xpcom-ipctmgrcom 
 
-DLLS += \
-        VBoxXPCOM \
-        VBoxXPCOMIPCC \
-        $(XPCOM_PYMOD)
+DLLS +=                         \
+        VBoxXPCOM               \
+        VBoxXPCOMIPCC           \
+        $(XPCOM_PYMOD)          \
+        $(XPCOM_VBOX_HELPER)
 
 ifdef VBOX_WITH_TESTCASES
@@ -1282 +1284 @@
 VBox-xpcom-helper_DEFS =
 VBox-xpcom-helper_SOURCES = \
-        python/src/module/helper.cpp
+        xpcom/helper/helper.cpp
 
 # Python Client Module
@@ -1290 +1292 @@
 
 VBox-xpcom-pymod_TEMPLATE = XPCOM
-# sucky name, maybe rename?
-VBox-xpcom-pymod_NAME = _xpcom
-VBox-xpcom-pymod_INST = bin/$(PY_PATH)/
+VBox-xpcom-pymod_NAME = VBoxPython
 VBox-xpcom-pymod_DEFS = _IMPL_NS_COM _IMPL_NS_BASE EXPORT_XPTI_API EXPORT_XPT_API VBOX_PYXPCOM
 VBox-xpcom-pymod_INCS += $(PYTHON_INCS) python/src
@@ -1318 +1318 @@
         python/src/TypeObject.cpp \
         python/src/VariantUtils.cpp
-VBox-xpcom-pymod_LIBS = $(TARGET_VBox-xpcom-helper)
-VBox-xpcom-pymod_LDFLAGS += $(PATH_BIN)/VBoxXPCOM.so
+VBox-xpcom-pymod_LIBS = $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL) 
 VBox-xpcom-pymod_DEPS = \
         $(PY_DEST)/components.py \
@@ -1336 +1335 @@
         $(PY_DEST)/server/policy.py \
         $(PY_SAMPLE)/vboxshell.py \
-        $(TARGET_VBox-xpcom-helper)
+        $(TARGET_VBoxXPCOM)
 
 $(PY_DEST):