VirtualBox

Ignore:
Timestamp:
Sep 1, 2009 9:30:13 AM (15 years ago)
Author:
vboxsync
Message:

Forward ported r51719 from the 3.0 branch.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/libs/xpcom18a4/Makefile.kmk

    r22631 r22639  
    251251# ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
    252252#
     253TEMPLATE_XPCOMOSX104                    = XPCOM libraries (shared) built against the Mac OS X 10.4 SDK
     254TEMPLATE_XPCOMOSX104_EXTENDS            = XPCOM
     255TEMPLATE_XPCOMOSX104_CXXFLAGS.darwin    = $(filter-out $(VBOX_DARWIN_DEF_SDK_CXXFLAGS),$(TEMPLATE_XPCOM_CXXFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_4_CXXFLAGS)
     256TEMPLATE_XPCOMOSX104_CFLAGS.darwin      = $(filter-out $(VBOX_DARWIN_DEF_SDK_CFLAGS),$(TEMPLATE_XPCOM_CFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_4_CFLAGS)
     257TEMPLATE_XPCOMOSX104_LDFLAGS.darwin     = $(filter-out $(VBOX_DARWIN_DEF_SDK_LDFLAGS),$(TEMPLATE_XPCOM_LDFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_4_LDFLAGS)
     258TEMPLATE_XPCOMOSX104_DEFS.darwin        = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPCOM_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_4_DEFS)
     259TEMPLATE_XPCOMOSX104_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_4)/Developer/Headers/FlatCarbon
     260
     261#
     262# Template for building VBoxPhython against the Mac OS X 10.5 SDK.
     263# ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
     264#
    253265TEMPLATE_XPCOMOSX105                    = XPCOM libraries (shared) built against the Mac OS X 10.5 SDK
    254266TEMPLATE_XPCOMOSX105_EXTENDS            = XPCOM
     
    258270TEMPLATE_XPCOMOSX105_DEFS.darwin        = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPCOM_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_5_DEFS)
    259271TEMPLATE_XPCOMOSX105_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_5)/Developer/Headers/FlatCarbon
     272
     273#
     274# Template for building VBoxPhython against the Mac OS X 10.6 SDK.
     275# ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
     276#
     277TEMPLATE_XPCOMOSX106                    = XPCOM libraries (shared) built against the Mac OS X 10.6 SDK
     278TEMPLATE_XPCOMOSX106_EXTENDS            = XPCOM
     279TEMPLATE_XPCOMOSX106_CXXFLAGS.darwin    = $(filter-out $(VBOX_DARWIN_DEF_SDK_CXXFLAGS),$(TEMPLATE_XPCOM_CXXFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_6_CXXFLAGS)
     280TEMPLATE_XPCOMOSX106_CFLAGS.darwin      = $(filter-out $(VBOX_DARWIN_DEF_SDK_CFLAGS),$(TEMPLATE_XPCOM_CFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_6_CFLAGS)
     281TEMPLATE_XPCOMOSX106_LDFLAGS.darwin     = $(filter-out $(VBOX_DARWIN_DEF_SDK_LDFLAGS),$(TEMPLATE_XPCOM_LDFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_6_LDFLAGS)
     282TEMPLATE_XPCOMOSX106_DEFS.darwin        = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPCOM_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_6_DEFS)
     283TEMPLATE_XPCOMOSX106_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_6)/Developer/Headers/FlatCarbon
    260284
    261285
     
    13971421 INSTALLS += VBoxPython-inst-py-xpcom
    13981422
    1399 # Python Client Module - the C++/XPCOM bits.
    1400 VBoxPython_TEMPLATE = XPCOM
    1401 VBoxPython_DEFS = _IMPL_NS_COM _IMPL_NS_BASE EXPORT_XPTI_API EXPORT_XPT_API \
    1402                   VBOX_PYXPCOM VBOX_WITH_XPCOM
    1403 VBoxPython_DEFS.darwin = VBOX_PYXPCOM_VERSIONED
    1404 VBoxPython_NAME.darwin = VBoxPython2_3
    1405 VBoxPython_NAME.darwin.amd64 = VBoxPython2_6
    1406 ifeq ($(KBUILD_TARGET),darwin)
    1407  ## @todo kBuild - this ain't working: VBoxPython_DLLSUFF.darwin = .so
    1408  VBoxPython_DLLSUFF = .so
    1409 endif
    1410 VBoxPython_CFLAGS.darwin   = $(VBOX_PYTHON_FRAMEWORK)
    1411 VBoxPython_CXXFLAGS.darwin = $(VBOX_PYTHON_FRAMEWORK)
    1412 VBoxPython_LDFLAGS.darwin  = $(VBOX_PYTHON_FRAMEWORK)
    1413 VBoxPython_INCS = \
    1414         python/src \
    1415         $(VBOX_PATH_PYTHON_INC)
    1416 VBoxPython_SOURCES = \
    1417         python/src/module/_xpcom.cpp \
    1418         python/src/dllmain.cpp \
    1419         python/src/ErrorUtils.cpp \
    1420         python/src/PyGBase.cpp \
    1421         python/src/PyGInputStream.cpp \
    1422         python/src/PyGModule.cpp \
    1423         python/src/PyGStub.cpp \
    1424         python/src/PyGWeakReference.cpp \
    1425         python/src/PyIClassInfo.cpp \
    1426         python/src/PyIComponentManager.cpp \
    1427         python/src/PyIComponentManagerObsolete.cpp \
    1428         python/src/PyIEnumerator.cpp \
    1429         python/src/PyIID.cpp \
    1430         python/src/PyIInputStream.cpp \
    1431         python/src/PyIInterfaceInfo.cpp \
    1432         python/src/PyIInterfaceInfoManager.cpp \
    1433         python/src/PyISimpleEnumerator.cpp \
    1434         python/src/PyISupports.cpp \
    1435         python/src/PyIVariant.cpp \
    1436         python/src/Pyxpt_info.cpp \
    1437         python/src/TypeObject.cpp \
    1438         python/src/VariantUtils.cpp
    1439 VBoxPython_LIBS = \
    1440         $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \
    1441         $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL) \
    1442         $(VBOX_LIB_PYTHON)
    1443 
    1444 if defined(VBOX_WITH_VBOXPYTHON_FOR_OSX_10_5) && "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "darwin.x86"
    1445 # Same VBoxPython except built against the Mac OS X 10.5 SDK.
    1446 DLLS += VBoxPython2_5
    1447 VBoxPython2_5_EXTENDS = VBoxPython
    1448 VBoxPython2_5_TEMPLATE = XPCOMOSX105
    1449 VBoxPython2_5_NAME.darwin = VBoxPython2_5
    1450 VBoxPython2_5_INCS = \
    1451         python/src \
    1452         $(VBOX_PATH_MACOSX_SDK_10_5)/System/Library/Frameworks/Python.framework/Headers
    1453 endif
    1454 
    1455 if defined(VBOX_WITH_VBOXPYTHON25_FOR_SOLARIS) && "$(KBUILD_TARGET)" == "solaris"
    1456 # Same VBoxPython except built against the newer python version.
    1457 DLLS += VBoxPython2_5
    1458 VBoxPython2_5_EXTENDS = VBoxPython
    1459 VBoxPython2_5_TEMPLATE = XPCOM
    1460 VBoxPython2_5_NAME = VBoxPython2_5
    1461 VBoxPython2_5_INCS = \
    1462         python/src \
    1463         /usr/include/python2.5
    1464 VBoxPython2_5_LIBS = \
    1465         $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \
    1466         $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL) \
    1467         /usr/lib/$(VBOX_TMP)libpython2.5$(SUFF_DLL)
    1468 endif
    1469 
    1470 # Python Client Module - the Python bits.
    1471 VBoxPython-inst-py-xpcom_INST = $(INST_SDK)bindings/xpcom/python/xpcom/
    1472 VBoxPython-inst-py-xpcom_SOURCES = \
    1473         python/vboxxpcom.py \
    1474         python/components.py \
    1475         python/file.py \
    1476         python/__init__.py \
    1477         python/nsError.py \
    1478         python/primitives.py \
    1479         python/xpcom_consts.py \
    1480         python/xpt.py \
    1481         python/client/__init__.py=>client/__init__.py \
    1482         python/server/__init__.py=>server/__init__.py \
    1483         python/server/enumerator.py=>server/enumerator.py \
    1484         python/server/factory.py=>server/factory.py \
    1485         python/server/loader.py=>server/loader.py \
    1486         python/server/module.py=>server/module.py \
    1487         python/server/policy.py=>server/policy.py
     1423 # Python Client Module - the C++/XPCOM bits.
     1424 VBoxPython_TEMPLATE = XPCOM
     1425 VBoxPython_DEFS = _IMPL_NS_COM _IMPL_NS_BASE EXPORT_XPTI_API EXPORT_XPT_API \
     1426                   VBOX_PYXPCOM VBOX_WITH_XPCOM
     1427 VBoxPython_DEFS.darwin = VBOX_PYXPCOM_VERSIONED
     1428 VBoxPython_NAME.darwin = VBoxPython2_3
     1429 VBoxPython_NAME.darwin.amd64 = VBoxPython2_6
     1430 ifeq ($(KBUILD_TARGET),darwin)
     1431  ## @todo kBuild - this ain't working: VBoxPython_DLLSUFF.darwin = .so
     1432  VBoxPython_DLLSUFF = .so
     1433 endif
     1434 VBoxPython_CFLAGS.darwin   = $(VBOX_PYTHON_FRAMEWORK)
     1435 VBoxPython_CXXFLAGS.darwin = $(VBOX_PYTHON_FRAMEWORK)
     1436 VBoxPython_LDFLAGS.darwin  = $(VBOX_PYTHON_FRAMEWORK)
     1437 VBoxPython_INCS = \
     1438        python/src \
     1439        $(VBOX_PATH_PYTHON_INC)
     1440 VBoxPython_SOURCES = \
     1441        python/src/module/_xpcom.cpp \
     1442        python/src/dllmain.cpp \
     1443        python/src/ErrorUtils.cpp \
     1444        python/src/PyGBase.cpp \
     1445        python/src/PyGInputStream.cpp \
     1446        python/src/PyGModule.cpp \
     1447        python/src/PyGStub.cpp \
     1448        python/src/PyGWeakReference.cpp \
     1449        python/src/PyIClassInfo.cpp \
     1450        python/src/PyIComponentManager.cpp \
     1451        python/src/PyIComponentManagerObsolete.cpp \
     1452        python/src/PyIEnumerator.cpp \
     1453        python/src/PyIID.cpp \
     1454        python/src/PyIInputStream.cpp \
     1455        python/src/PyIInterfaceInfo.cpp \
     1456        python/src/PyIInterfaceInfoManager.cpp \
     1457        python/src/PyISimpleEnumerator.cpp \
     1458        python/src/PyISupports.cpp \
     1459        python/src/PyIVariant.cpp \
     1460        python/src/Pyxpt_info.cpp \
     1461        python/src/TypeObject.cpp \
     1462        python/src/VariantUtils.cpp
     1463 VBoxPython_LIBS = \
     1464        $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \
     1465        $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL) \
     1466        $(VBOX_LIB_PYTHON)
     1467
     1468 if !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_5) && "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "darwin.x86"
     1469  # Same as VBoxPython except built against the Mac OS X 10.5 SDK.
     1470  DLLS += VBoxPython2_5
     1471  VBoxPython2_5_EXTENDS = VBoxPython
     1472  VBoxPython2_5_TEMPLATE = XPCOMOSX105
     1473  VBoxPython2_5_NAME.darwin = VBoxPython2_5
     1474  VBoxPython2_5_INCS = \
     1475        python/src \
     1476        $(VBOX_PATH_MACOSX_SDK_10_5)/System/Library/Frameworks/Python.framework/Headers
     1477 endif
     1478
     1479 if defined(VBOX_WITH_VBOXPYTHON25_FOR_SOLARIS) && "$(KBUILD_TARGET)" == "solaris"
     1480  # Same as VBoxPython except built against the newer python version.
     1481  DLLS += VBoxPython2_5
     1482  VBoxPython2_5_EXTENDS = VBoxPython
     1483  VBoxPython2_5_TEMPLATE = XPCOM
     1484  VBoxPython2_5_NAME = VBoxPython2_5
     1485  VBoxPython2_5_INCS = \
     1486        python/src \
     1487        /usr/include/python2.5
     1488  VBoxPython2_5_LIBS = \
     1489        $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \
     1490        $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL) \
     1491        /usr/lib/$(VBOX_TMP)libpython2.5$(SUFF_DLL)
     1492 endif
     1493
     1494 if !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6) && "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "darwin.x86"
     1495  # Same as VBoxPython except built against the Mac OS X 10.6 SDK.
     1496  DLLS += VBoxPython2_6
     1497  VBoxPython2_6_EXTENDS = VBoxPython
     1498  VBoxPython2_6_TEMPLATE = XPCOMOSX106
     1499  VBoxPython2_6_NAME.darwin = VBoxPython2_6
     1500  VBoxPython2_6_INCS = \
     1501        python/src \
     1502        $(VBOX_PATH_MACOSX_SDK_10_6)/System/Library/Frameworks/Python.framework/Headers
     1503 endif
     1504
     1505 # Python Client Module - the Python bits.
     1506 VBoxPython-inst-py-xpcom_INST = $(INST_SDK)bindings/xpcom/python/xpcom/
     1507 VBoxPython-inst-py-xpcom_SOURCES = \
     1508        python/vboxxpcom.py \
     1509        python/components.py \
     1510        python/file.py \
     1511        python/__init__.py \
     1512        python/nsError.py \
     1513        python/primitives.py \
     1514        python/xpcom_consts.py \
     1515        python/xpt.py \
     1516        python/client/__init__.py=>client/__init__.py \
     1517        python/server/__init__.py=>server/__init__.py \
     1518        python/server/enumerator.py=>server/enumerator.py \
     1519        python/server/factory.py=>server/factory.py \
     1520        python/server/loader.py=>server/loader.py \
     1521        python/server/module.py=>server/module.py \
     1522        python/server/policy.py=>server/policy.py
    14881523
    14891524endif # !VBOX_WITH_MULTIVERSION_PYTHON
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette