Changeset 28362 in vbox

Timestamp:

Apr 15, 2010 1:46:41 PM (15 years ago)

Author:

vboxsync

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

60122

Message:

python: always use Python multiversion code

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/libs/xpcom18a4/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -455 +455 @@
 # Enables the Python<->XPCOM and Python<->COM bindings.
 VBOX_WITH_PYTHON ?= 1
-# Build multiple Python<->XPCOM bridges for different Python version
-#ifn1of ($(KBUILD_TARGET), darwin)
-VBOX_WITH_MULTIVERSION_PYTHON ?= 1
-#endif
 # Enable the kchmviewer.
 VBOX_WITH_KCHMVIEWER = 1

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -1361 +1361 @@
 # 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
-   VBOX_PYTHON_FRAMEWORK := -framework Python
-   VBOX_PATH_PYTHON_INC := $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Headers
-  endif
- else  # !darwin || configured darwin
-  ifndef VBOX_PATH_PYTHON_INC
-   # As we build Solaris on newer Nevadas (109 currently) we want to use libpython2.4 for IPS compatiblity
-   # with older Nevada/OpenSolaris versions upon importing/installing the package. Otherwise we pick the
-   # highest libpython2.X available on the build box (2.6 on 109). We thus hardcode it to 2.4 here...
-   ifeq ($(KBUILD_TARGET),solaris)
-    VBOX_PATH_PYTHON_INC := /usr/include/python2.4
-   else
-    VBOX_PATH_PYTHON_INC := $(patsubst %/Python.h,%, $(lastword $(sort $(wildcard \
-        /usr/include/python2.*/Python.h \
-        /usr/local/include/python2.*/Python.h \
-        ))))
-   endif
-   ifeq ($(VBOX_PATH_PYTHON_INC),)
-    $(warning Unable to determine the python include directory (VBOX_PATH_PYTHON_INC).)
-   endif
-  endif
-  VBOX_PYTHON_VER := 2$(lastword $(subst ., .,$(VBOX_PATH_PYTHON_INC)))
-  ifndef VBOX_LIB_PYTHON
-   VBOX_TMP := $(if $(eq $(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),solaris.amd64),64/,)
-   VBOX_LIB_PYTHON := $(firstword $(wildcard \
-        /usr/lib/$(VBOX_TMP)libpython$(VBOX_PYTHON_VER)$(SUFF_DLL) \
-        /usr/local/lib/$(VBOX_TMP)libpython$(VBOX_PYTHON_VER)$(SUFF_DLL) \
-        /usr/lib/$(VBOX_TMP)libpython2$(SUFF_DLL) \
-        /usr/local/lib/$(VBOX_TMP)libpython2$(SUFF_DLL) \
-        /usr/lib/$(VBOX_TMP)libpython$(SUFF_DLL) \
-        /usr/local/lib/$(VBOX_TMP)libpython$(SUFF_DLL) \
-        ))
-   ifeq ($(VBOX_LIB_PYTHON),)
-    $(warning Unable to determine the python library (VBOX_LIB_PYTHON).)
-   endif
-  endif # !darwin || configured darwin
- endif
- ifndef VBOX_ONLY_SDK
-  DLLS += VBoxPython
- endif
- INSTALLS += VBoxPython-inst-py-xpcom
-
- # Python Client Module - the C++/XPCOM bits.
- VBoxPython_TEMPLATE = XPCOM
- 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_$(translate $(substr $(VBOX_DEF_MACOSX_VERSION_MIN),4),456,356)
- ifeq ($(KBUILD_TARGET),darwin)
-  ## @todo kBuild - this ain't working: VBoxPython_DLLSUFF.darwin = .so
-  VBoxPython_DLLSUFF = .so
- endif
- VBoxPython_LDFLAGS.darwin  = $(VBOX_PYTHON_FRAMEWORK)
- VBoxPython_CXXFLAGS = -Wno-format
- VBoxPython_INCS = \
-        python/src \
-        $(VBOX_PATH_PYTHON_INC)
- VBoxPython_SOURCES = \
-        python/src/module/_xpcom.cpp \
-        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
- VBoxPython_LIBS = \
-        $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \
-        $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL) \
-        $(VBOX_LIB_PYTHON)
-
- if  !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_5) \
-  && "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "darwin.x86" \
-  && "$(VBOX_DEF_MACOSX_VERSION_MIN)" != "10.5"
-  # Same as VBoxPython except built against the Mac OS X 10.5 SDK.
-  DLLS += VBoxPython2_5
-  VBoxPython2_5_EXTENDS = VBoxPython
-  VBoxPython2_5_TEMPLATE = XPCOMOSX105
-  VBoxPython2_5_NAME.darwin = VBoxPython2_5
-  VBoxPython2_5_INCS = \
-        python/src \
-        $(VBOX_PATH_MACOSX_SDK_10_5)/System/Library/Frameworks/Python.framework/Headers
- endif
-
- if defined(VBOX_WITH_VBOXPYTHON25_FOR_SOLARIS) && "$(KBUILD_TARGET)" == "solaris"
-  # Same as VBoxPython except built against the newer python version.
-  DLLS += VBoxPython2_5
-  VBoxPython2_5_EXTENDS = VBoxPython
-  VBoxPython2_5_TEMPLATE = XPCOM
-  VBoxPython2_5_NAME = VBoxPython2_5
-  VBoxPython2_5_INCS = \
-        python/src \
-        /usr/include/python2.5
-  VBoxPython2_5_LIBS = \
-        $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \
-        $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL) \
-        /usr/lib/$(VBOX_TMP)libpython2.5$(SUFF_DLL)
- endif
-
- if !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6) \
-  && "$(KBUILD_TARGET)" == "darwin" \
-  && "$(VBOX_DEF_MACOSX_VERSION_MIN)" != "10.6"
-  # Same as VBoxPython except built against the Mac OS X 10.6 SDK.
-  DLLS += VBoxPython2_6
-  VBoxPython2_6_EXTENDS = VBoxPython
-  VBoxPython2_6_TEMPLATE = XPCOMOSX106
-  VBoxPython2_6_NAME.darwin = VBoxPython2_6
-  VBoxPython2_6_INCS = \
-        python/src \
-        $(VBOX_PATH_MACOSX_SDK_10_6)/System/Library/Frameworks/Python.framework/Headers
- endif
-
- # Python Client Module - the Python bits.
- VBoxPython-inst-py-xpcom_INST = $(INST_SDK)bindings/xpcom/python/xpcom/
- VBoxPython-inst-py-xpcom_SOURCES = \
-        python/vboxxpcom.py \
-        python/components.py \
-        python/file.py \
-        python/__init__.py \
-        python/nsError.py \
-        python/primitives.py \
-        python/xpcom_consts.py \
-        python/xpt.py \
-        python/client/__init__.py=>client/__init__.py \
-        python/server/__init__.py=>server/__init__.py \
-        python/server/enumerator.py=>server/enumerator.py \
-        python/server/factory.py=>server/factory.py \
-        python/server/loader.py=>server/loader.py \
-        python/server/module.py=>server/module.py \
-        python/server/policy.py=>server/policy.py
-
-endif # !VBOX_WITH_MULTIVERSION_PYTHON
+  include $(PATH_SUB_CURRENT)/python/Makefile.kmk
 endif # VBOX_WITH_PYTHON