Changeset 11587 in vbox for trunk/src/libs

Timestamp:

Aug 22, 2008 9:42:22 PM (16 years ago)

Author:

vboxsync

Message:

VBOX_WITH_PYTHON, makefile variable scoping, adjustments to the python include guessing.

File:

• trunk/src/libs/xpcom18a4/Makefile.kmk (modified) (8 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -37 +37 @@
 # should be a check whether VBoxXPCOM.so contains global C symbols (at least
 # where the whitelisting of symbols via the map file is not used).
-
-
-# Temporary disable everywhere, as there's no decent Python headers
-# installed on build servers
-#if1of ($(KBUILD_TARGET), linux)
-ifeq ($(VBOX_WITH_PYTHON),1)
-# Find most appropriate Python headers
-PYTHON_INCS=$(lastword $(sort $(wildcard /usr/include/python2.*/)))
-ifeq ($(wildcard $(PYTHON_INCS)/Python.h),)
-PYTHON_INCS=
-endif
-endif
-
-# build Python<->XPCOM bridge only if Python headers found
-ifneq ($(PYTHON_INCS),)
-# bridge for Python to invoke XPCOM
-XPCOM_PYMOD = VBox-xpcom-pymod
-endif
 
 #
@@ -280 +262 @@
         VBox-xpcom-ipcdlock \
         VBox-xpcom-ipctransmgr \
-        VBox-xpcom-ipctmgrcom 
-
-DLLS +=                         \
-        VBoxXPCOM               \
-        VBoxXPCOMIPCC           \
-        $(XPCOM_PYMOD)          
-
-# we put it here, as template it uses depends on VBoxRT, 
+        VBox-xpcom-ipctmgrcom
+
+DLLS += \
+        VBoxXPCOM \
+        VBoxXPCOMIPCC
+
+# we put it here, as template it uses depends on VBoxRT,
 # which may not be built yet
-OTHERS +=                       \
+OTHERS += \
         $(TARGET_VBox-xpcom-helper)
 
@@ -1260 +1241 @@
 
 
+#
 # DCONNECT client shared object
+#
 VBoxXPCOMIPCC_TEMPLATE = XPCOMIPC
 VBoxXPCOMIPCC_NAME.os2 = VBoxIPCC
@@ -1290 +1273 @@
 
 
+#
+# DCONNECT daemon executable
+#
+VBoxXPCOMIPCD_TEMPLATE = XPCOMIPCEXE
+VBoxXPCOMIPCD_SOURCES = \
+        ipc/ipcd/daemon/src/ipcd.cpp \
+        ipc/ipcd/daemon/src/ipcClient.cpp \
+        ipc/ipcd/daemon/src/ipcModuleReg.cpp \
+        ipc/ipcd/daemon/src/ipcCommandModule.cpp
+ifeq ($(KBUILD_TARGET),win)
+ VBoxXPCOMIPCD_SOURCES += \
+        ipc/ipcd/daemon/src/ipcdWin.cpp
+else
+ VBoxXPCOMIPCD_SOURCES += \
+        ipc/ipcd/daemon/src/ipcdUnix.cpp
+endif
+
+
+#
 # Helper for initialization of XPCOM
+#
 VBox-xpcom-helper_TEMPLATE = VBOXMAINCLIENTDLL
+## @todo why isn't this targetd called VBoxHlp and what is it good for anyway? it's not in any of the lists so it won't be processed or anything...
 VBox-xpcom-helper_NAME = VBoxHlp
 VBox-xpcom-helper_DEFS =
@@ -1297 +1301 @@
         xpcom/helper/helper.cpp
 
-# Python Client Module
+
+#
+# Python<->XPCOM bridge.
+#
+
+# Find the Python headers for the Python<->XPCOM bridge if enabled.
+ifdef VBOX_WITH_PYTHON
+  ifndef VBOX_PATH_PYTHON_INC
+   VBOX_PATH_PYTHON_INC := $(patsubst %/Python.h,%, $(lastword $(sort $(wildcard \
+        /usr/include/python2.*/Python.h \
+        /usr/local/include/python2.*/Python.h \
+        ))))
+   ifeq ($(VBOX_PATH_PYTHON_INC),)
+    $(warning Unable to determin the python include directory (VBOX_PATH_PYTHON_INC).)
+   endif
+ endif
+ DLLS +=VBox-xpcom-pymod
+endif
+
+# Python Client Module.
 PY_PATH = sdk/bindings/com/python/xpcom
 PY_DEST = $(PATH_BIN)/$(PY_PATH)
@@ -1303 +1326 @@
 
 VBox-xpcom-pymod_TEMPLATE = XPCOM
+## @todo why isn't this target called VBoxPython?
 VBox-xpcom-pymod_NAME = VBoxPython
 VBox-xpcom-pymod_DEFS = _IMPL_NS_COM _IMPL_NS_BASE EXPORT_XPTI_API EXPORT_XPT_API VBOX_PYXPCOM
-VBox-xpcom-pymod_INCS += $(PYTHON_INCS) python/src
+VBox-xpcom-pymod_INCS += $(VBOX_PATH_PYTHON_INC) python/src
 VBox-xpcom-pymod_SOURCES = \
         python/src/module/_xpcom.cpp \
@@ -1329 +1353 @@
         python/src/TypeObject.cpp \
         python/src/VariantUtils.cpp
-VBox-xpcom-pymod_LIBS = $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL) 
+VBox-xpcom-pymod_LIBS = $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
+## @todo rewrite this to an INSTALLS target, it's just copying.
 VBox-xpcom-pymod_DEPS = \
         $(PY_DEST)/components.py \
@@ -1361 +1386 @@
         $(QUIET)$(CP) -f -- $< $@
 
-
-# DCONNECT daemon executable
-VBoxXPCOMIPCD_TEMPLATE = XPCOMIPCEXE
-VBoxXPCOMIPCD_SOURCES = \
-        ipc/ipcd/daemon/src/ipcd.cpp \
-        ipc/ipcd/daemon/src/ipcClient.cpp \
-        ipc/ipcd/daemon/src/ipcModuleReg.cpp \
-        ipc/ipcd/daemon/src/ipcCommandModule.cpp
-ifeq ($(KBUILD_TARGET),win)
- VBoxXPCOMIPCD_SOURCES += \
-        ipc/ipcd/daemon/src/ipcdWin.cpp
-else
- VBoxXPCOMIPCD_SOURCES += \
-        ipc/ipcd/daemon/src/ipcdUnix.cpp
-endif
 
 #