Changeset 12388 in vbox for trunk

Timestamp:

Sep 11, 2008 1:14:55 AM (17 years ago)

Author:

vboxsync

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

36434

Message:

VBoxPython: Need initVBoxPython2_3 for VBoxPython2_3.so, just like for the 2.5 version. Wonder why it used to work...

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (2 diffs)
• python/src/module/_xpcom.cpp (modified) (3 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -1351 +1351 @@
 VBoxPython_DEFS = _IMPL_NS_COM _IMPL_NS_BASE EXPORT_XPTI_API EXPORT_XPT_API \
                   VBOX_PYXPCOM VBOX_WITH_XPCOM
+VBoxPython_DEFS.darwin = VBOX_PYXPCOM_VERSIONED
 VBoxPython_NAME.darwin = VBoxPython2_3
 ifeq ($(KBUILD_TARGET),darwin)
@@ -1396 +1397 @@
 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

@@ -73 +73 @@
 #ifdef VBOX_PYXPCOM
 # ifdef VBOX_PYXPCOM_VERSIONED
-#  if PY_VERSION_HEX >= 0x02080000
+#  if   PY_VERSION_HEX >= 0x02080000
 #   define MODULE_NAME "VBoxPython2_8"
 #  elif PY_VERSION_HEX >= 0x02070000
@@ -611 +611 @@
 void
 # ifdef VBOX_PYXPCOM_VERSIONED
-#  if PY_VERSION_HEX >= 0x02080000
+#  if   PY_VERSION_HEX >= 0x02080000
 initVBoxPython2_8() {
 #  elif PY_VERSION_HEX >= 0x02070000
@@ -620 +620 @@
 initVBoxPython2_5() {
 #  elif PY_VERSION_HEX >= 0x02040000
-#   error "you must test VBOX_PYXPCOM_VERSIONED on 2.4"
-initVBoxPython() {
+initVBoxPython2_4() {
 #  elif PY_VERSION_HEX >= 0x02030000
-#   error "you must test VBOX_PYXPCOM_VERSIONED on 2.3"
-initVBoxPython() {
+initVBoxPython2_3() {
 #  else
 #   error "Fix module versioning.