Changeset 23324 in vbox

Timestamp:

Sep 25, 2009 10:19:14 AM (15 years ago)

Author:

vboxsync

Message:

xpcom18a4/Makefile.kmk,Installer/darwin/Makefile.kmk: Don't ship VBoxPython2_3.so when not targetting 10.4.

File:

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

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -1426 +1426 @@
  VBoxPython_TEMPLATE = XPCOM
  VBoxPython_DEFS = _IMPL_NS_COM _IMPL_NS_BASE EXPORT_XPTI_API EXPORT_XPT_API \
-                   VBOX_PYXPCOM VBOX_WITH_XPCOM
+        VBOX_PYXPCOM VBOX_WITH_XPCOM
  VBoxPython_DEFS.darwin = VBOX_PYXPCOM_VERSIONED
- VBoxPython_NAME.darwin = VBoxPython2_3
- VBoxPython_NAME.darwin.amd64 = VBoxPython2_6
+ 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
@@ -1468 +1467 @@
         $(VBOX_LIB_PYTHON)
 
- if !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_5) && "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "darwin.x86"
+ 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
@@ -1494 +1495 @@
  endif
 
- if !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6) && "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "darwin.x86"
+ if !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6) \
+  && "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "darwin" \
+  && "$(VBOX_DEF_MACOSX_VERSION_MIN)" != "10.6"
   # Same as VBoxPython except built against the Mac OS X 10.6 SDK.
   DLLS += VBoxPython2_6