Changeset 11440 in vbox for trunk/src/libs

Timestamp:

Aug 15, 2008 11:06:35 AM (16 years ago)

Author:

vboxsync

Message:

• imported Python COM bindings

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (8 diffs)
• xpcom/base/nscore.h (modified) (1 diff)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -27 +27 @@
 endif
 include $(KBUILD_PATH)/subheader.kmk
+
+ifdef VBOX_WITH_PYTHON
+# bridge for XPCOM to invoke Python
+XPCOM_PYTHON = VBox-xpcom-python
+# bridge for Python to invoke XPCOM
+XPCOM_PYMOD  = VBox-xpcom-pymod
+PYTHON_LIBS  = python2.5
+endif
 
 #
@@ -248 +256 @@
         VBox-xpcom-ipcdlock \
         VBox-xpcom-ipctransmgr \
-        VBox-xcpom-ipctmgrcom
+        VBox-xpcom-ipctmgrcom  \
+        $(XPCOM_PYTHON) \
+        $(PYTHON_LIBS)
 
 DLLS += \
         VBoxXPCOM \
-        VBoxXPCOMIPCC
+        VBoxXPCOMIPCC \
+        $(XPCOM_PYMOD)
 
 ifdef VBOX_WITH_TESTCASES
@@ -1109 +1120 @@
         $(TARGET_VBox-xpcom-proxy) \
         $(TARGET_VBox-xpcom-nspr) \
-        $(TARGET_VBoxXPCOMGlue_s)
+        $(TARGET_$(XPCOM_PYTHON)) \
+        $(PYTHON_LIBS)            \
+        $(TARGET_VBoxXPCOMGlue_s) 
 
 ifeq ($(filter-out freebsd l4 linux netbsd openbsd,$(KBUILD_TARGET)),) # gnu ld.
@@ -1124 +1137 @@
         $(TARGET_VBox-xpcom-proxy) \
         $(TARGET_VBox-xpcom-nspr) \
+        $(TARGET_$(XPCOM_PYTHON))\
         $(TARGET_VBoxXPCOMGlue_s) \
         -Wl,--no-whole-archive
@@ -1139 +1153 @@
         $(TARGET_VBox-xpcom-xptcall) \
         $(TARGET_VBox-xpcom-proxy) \
+        $(TARGET_$(XPCOM_PYTHON))\
         $(TARGET_VBox-xpcom-nspr) \
         $(TARGET_VBoxXPCOMGlue_s) \
@@ -1208 +1223 @@
         ipc/ipcd/extensions/transmngr/src/tmTransactionService.cpp
 
-VBox-xcpom-ipctmgrcom_TEMPLATE = XPCOMIPC
-VBox-xcpom-ipctmgrcom_NOINST = 1
-VBox-xcpom-ipctmgrcom_SOURCES = \
+VBox-xpcom-ipctmgrcom_TEMPLATE = XPCOMIPC
+VBox-xpcom-ipctmgrcom_NOINST = 1
+VBox-xpcom-ipctmgrcom_SOURCES = \
         ipc/ipcd/extensions/transmngr/common/tmTransaction.cpp \
         ipc/ipcd/extensions/transmngr/common/tmVector.cpp
@@ -1240 +1255 @@
         $(TARGET_VBox-xpcom-ipcdlock) \
         $(TARGET_VBox-xpcom-ipctransmgr) \
-        $(TARGET_VBox-xcpom-ipctmgrcom)
+        $(TARGET_VBox-xpcom-ipctmgrcom)
 # EF
 #VBoxXPCOMIPCC_LIBS += $(LIB_RUNTIME)
+
+
+# Python XPCOM bindings
+VBox-xpcom-python_TEMPLATE = XPCOM
+VBox-xpcom-python_NOINST = 1
+VBox-xpcom-python_DEFS = _IMPL_NS_COM _IMPL_NS_BASE EXPORT_XPTI_API EXPORT_XPT_API
+VBox-xpcom-python_INCS += /usr/include/python2.5
+VBox-xpcom-python_SOURCES =                             \
+        python/src/dllmain.cpp                          \
+        python/src/ErrorUtils.cpp                       \
+        python/src/PyGBase.cpp                          \
+        python/src/PyGInputStream.cpp                   \
+        python/src/PyGModule.cpp                        \
+        python/src/PyGStub.cpp                          \
+        python/src/PyGWeakReference.cpp                 \
+        python/src/PyIClassInfo.cpp                     \
+        python/src/PyIComponentManager.cpp              \
+        python/src/PyIComponentManagerObsolete.cpp      \
+        python/src/PyIEnumerator.cpp                    \
+        python/src/PyIID.cpp                            \
+        python/src/PyIInputStream.cpp                   \
+        python/src/PyIInterfaceInfo.cpp                 \
+        python/src/PyIInterfaceInfoManager.cpp          \
+        python/src/PyISimpleEnumerator.cpp              \
+        python/src/PyISupports.cpp                      \
+        python/src/PyIVariant.cpp                       \
+        python/src/Pyxpt_info.cpp                       \
+        python/src/TypeObject.cpp                       \
+        python/src/VariantUtils.cpp                     \
+
+
+# Python Clienr Module
+VBox-xpcom-pymod_TEMPLATE = XPCOM
+VBox-xpcom-pymod_DEFS = _IMPL_NS_COM _IMPL_NS_BASE EXPORT_XPTI_API EXPORT_XPT_API
+VBox-xpcom-pymod_INCS += /usr/include/python2.5 python/src
+VBox-xpcom-pymod_SOURCES =                              \
+        python/src/module/_xpcom.cpp                    
 
 # DCONNECT daemon executable
@@ -1564 +1616 @@
 # Manual dependency...
 xpcom/string/src/nsAString.cpp: $(PATH_VBox-xpcom-string)/idl_ts
-

trunk/src/libs/xpcom18a4/xpcom/base/nscore.h

@@ -156 +156 @@
 #define NS_DEFCALL
 #endif
+
+/* XXX: nike, maybe fix */
+#define NS_EXPORT_STATIC_MEMBER_(type) type
+#define NS_IMPORT_STATIC_MEMBER_(type) type
 
 #ifdef NS_WIN32