Changeset 20936 in vbox for trunk

Timestamp:

Jun 25, 2009 12:58:12 PM (16 years ago)

Author:

vboxsync

Message:

Python: support for building multiple versions

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (3 diffs)
• python/Makefile.kmk (added)
• python/gen_python_deps.py (added)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -1349 +1349 @@
 # Find the Python headers for the Python<->XPCOM bridge if enabled.
 ifdef VBOX_WITH_PYTHON
+ifdef VBOX_WITH_MULTIVERSION_PYTHON
+ include $(PATH_SUB_CURRENT)/python/Makefile.kmk
+else
  if "$(KBUILD_TARGET)" == "darwin" && !defined(VBOX_PATH_PYTHON_INC) && !defined(VBOX_LIB_PYTHON)
   ifndef VBOX_PYTHON_FRAMEWORK
@@ -1392 +1395 @@
  endif
  INSTALLS += VBoxPython-inst-py-xpcom
-endif
-
-# Kibd of hack: we don't want to limit VBoxPython.so to single Python version
-# on Linux, where we can avoid putting explicit libpythonX.Y.so dependency
-# to VBoxPython.so
-if "$(KBUILD_TARGET)" == "linux"
- VBOX_LIB_PYTHON=
-endif
+
+ # Kind of hack: we don't want to limit VBoxPython.so to single Python version
+ # on Linux, where we can avoid putting explicit libpythonX.Y.so dependency
+ # to VBoxPython.so
+ if "$(KBUILD_TARGET)" == "linux"
+  VBOX_LIB_PYTHON=
+ endif
 
 # Python Client Module - the C++/XPCOM bits.
@@ -1475 +1477 @@
         python/server/module.py=>server/module.py \
         python/server/policy.py=>server/policy.py
+
+endif # !VBOX_WITH_MULTIVERSION_PYTHON
+endif # VBOX_WITH_PYTHON
 
 #