儲存庫 vbox 的更動 12379

時間撮記:

2008-9-10 下午09:53:10 (16 年 以前)

作者:

vboxsync

訊息:

xpcom/VBoxPython2_5: seems the initializer function needs to be init+module name.

位置:

trunk/src/libs/xpcom18a4

檔案:

• Makefile.kmk (修改) (1 筆差異)
• python/src/module/_xpcom.cpp (修改) (10 筆差異)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -1392 +1392 @@
 VBoxPython2_5_TEMPLATE = XPCOMOSX105
 VBoxPython2_5_NAME.darwin = VBoxPython2_5
+VBoxPython2_5_DEFS = VBOX_PYXPCOM_VERSIONED $(VBoxPython_DEFS)
 VBoxPython2_5_INCS = \
         python/src \

trunk/src/libs/xpcom18a4/python/src/module/_xpcom.cpp

@@ -72 +72 @@
 
 #ifdef VBOX_PYXPCOM
-#define MODULE_NAME "VBoxPython"
+# ifdef VBOX_PYXPCOM_VERSIONED
+#  if PY_VERSION_HEX >= 0x02080000
+#   define MODULE_NAME "VBoxPython2_8"
+#  elif PY_VERSION_HEX >= 0x02070000
+#   define MODULE_NAME "VBoxPython2_7"
+#  elif PY_VERSION_HEX >= 0x02060000
+#   define MODULE_NAME "VBoxPython2_6"
+#  elif PY_VERSION_HEX >= 0x02050000
+#   define MODULE_NAME "VBoxPython2_5"
+#  elif PY_VERSION_HEX >= 0x02040000
+#   define MODULE_NAME "VBoxPython2_4"
+#  elif PY_VERSION_HEX >= 0x02030000
+#   define MODULE_NAME "VBoxPython2_3"
+#  else
+#   error "Fix module versioning.
+#  endif
+# else
+#  define MODULE_NAME "VBoxPython"
+# endif
 #else
 #define MODULE_NAME "_xpcom"
@@ -163 +181 @@
         return PyXPCOMMethod_GetComponentManager(self, args);
 }
-                
+
 static PyObject *
 PyXPCOMMethod_XPTI_GetInterfaceInfoManager(PyObject *self, PyObject *args)
@@ -208 +226 @@
         // will return the "original" gateway when QI'd for nsISupports)
         if (!Py_nsISupports::InterfaceFromPyObject(
-                        obIS, 
-                        Py_nsIID_NULL, 
-                        getter_AddRefs(pis), 
+                        obIS,
+                        Py_nsIID_NULL,
+                        getter_AddRefs(pis),
                         PR_FALSE))
                 return NULL;
@@ -266 +284 @@
         nsIInternalPython *iob = NULL;
         PyObject *ret = NULL;
-        if (!Py_nsISupports::InterfaceFromPyObject(ob, 
-                                NS_GET_IID(nsISupports), 
-                                &uob, 
+        if (!Py_nsISupports::InterfaceFromPyObject(ob,
+                                NS_GET_IID(nsISupports),
+                                &uob,
                                 PR_FALSE))
                 goto done;
@@ -356 +374 @@
         nsCOMPtr<nsISupports> presult;
         Py_BEGIN_ALLOW_THREADS;
-        nsCOMPtr<nsIProxyObjectManager> proxyMgr = 
+        nsCOMPtr<nsIProxyObjectManager> proxyMgr =
                  do_GetService(kProxyObjectManagerCID, &rv_proxy);
 
@@ -404 +422 @@
 
         nsCOMPtr<nsIVariant> var;
-        if (!Py_nsISupports::InterfaceFromPyObject(ob, 
-                                NS_GET_IID(nsISupports), 
-                                getter_AddRefs(var), 
+        if (!Py_nsISupports::InterfaceFromPyObject(ob,
+                                NS_GET_IID(nsISupports),
+                                getter_AddRefs(var),
                                 PR_FALSE))
                 return PyErr_Format(PyExc_ValueError,
@@ -482 +500 @@
         {"GetServiceManager", PyXPCOMMethod_GetServiceManager, 1},
         {"GetGlobalServiceManager", PyXPCOMMethod_GetGlobalServiceManager, 1}, // deprecated
-        {"IID", PyXPCOMMethod_IID, 1}, // IID is wrong - deprecated - not just IID, but CID, etc. 
+        {"IID", PyXPCOMMethod_IID, 1}, // IID is wrong - deprecated - not just IID, but CID, etc.
         {"ID", PyXPCOMMethod_IID, 1}, // This is the official name.
         {"NS_ShutdownXPCOM", PyXPCOMMethod_NS_ShutdownXPCOM, 1},
@@ -517 +535 @@
 //
 extern "C" NS_EXPORT
-void 
+void
 init_xpcom() {
         PyObject *oModule;
@@ -591 +609 @@
 
 extern "C" NS_EXPORT
-void 
+void
+# ifdef VBOX_PYXPCOM_VERSIONED
+#  if PY_VERSION_HEX >= 0x02080000
+initVBoxPython2_8() {
+#  elif PY_VERSION_HEX >= 0x02070000
+initVBoxPython2_7() {
+#  elif PY_VERSION_HEX >= 0x02060000
+initVBoxPython2_6() {
+#  elif PY_VERSION_HEX >= 0x02050000
+initVBoxPython2_5() {
+#  elif PY_VERSION_HEX >= 0x02040000
+#   error "you must test VBOX_PYXPCOM_VERSIONED on 2.4"
 initVBoxPython() {
+#  elif PY_VERSION_HEX >= 0x02030000
+#   error "you must test VBOX_PYXPCOM_VERSIONED on 2.3"
+initVBoxPython() {
+#  else
+#   error "Fix module versioning.
+#  endif
+# else
+initVBoxPython() {
+# endif
   static bool s_vboxInited = false;
   if (!s_vboxInited) {
@@ -610 +648 @@
       rc = RTR3Init();
     }
-#endif 
+#endif
 
     rc = com::Initialize();