Changeset 98997 in vbox

Timestamp:

Mar 16, 2023 9:21:19 AM (2 years ago)

Author:

vboxsync

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

156347

Message:

Installer/darwin,xpcom18a4/python: Some Makefile cleanups for the darwin part, bugref:9790

Location:

trunk/src

Files:

• VBox/Installer/darwin/Makefile.kmk (modified) (2 diffs)
• libs/xpcom18a4/python/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Installer/darwin/Makefile.kmk

@@ -471 +471 @@
  VBOX_DI_VBAPP_DYLIBS += $(addprefix MacOS/,$(addsuffix .dylib,$(notdir $(VBOX_DI_VBAPP_PROGS_HARDENED))))
 endif
-ifdef VBOX_WITH_HDDPARALLELS_INSTALL
- VBOX_DI_VBAPP_DYLIBS += \
-        MacOS/VBoxHDDParallels.dylib
-endif
-if defined(VBOX_WITH_PYTHON) && !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6) && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vlt "10.13"
+if defined(VBOX_WITH_PYTHON) && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vlt "10.13"
  VBOX_DI_VBAPP_DYLIBS += \
         MacOS/VBoxPython2_6.so
 endif
-if defined(VBOX_WITH_PYTHON) && !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_7)
+if defined(VBOX_WITH_PYTHON)
  VBOX_DI_VBAPP_DYLIBS += \
         MacOS/VBoxPython2_7.so
@@ -492 +488 @@
         MacOS/VBoxDxVk.dylib \
         MacOS/libMoltenVK.dylib
-endif
-
-ifdef VBOX_WITH_PYTHON
- VBOX_DI_VBAPP_DYLIBS.x86 += \
-        MacOS/VBoxPython2_5.so \
-        $(if-expr defined(VBOX_WITH_MAC_OS_X_10_4_SUPPORT),MacOS/VBoxPython2_3.so,)
-endif
-
-VBOX_DI_VBAPP_DYLIBS.amd64 :=
-if defined(VBOX_WITH_PYTHON) && defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6) && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vlt "10.13"
- VBOX_DI_VBAPP_DYLIBS.amd64 += \
-        MacOS/VBoxPython2_6.so
 endif
 

trunk/src/libs/xpcom18a4/python/Makefile.kmk

@@ -40 +40 @@
   VBOX_PYTHON_SUFFTBD :=
  endif
- ifndef VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6
-  if1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.5 10.4)
-   VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/include/python2.6
-   VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib
-  else if "$(VBOX_DEF_MACOSX_VERSION_MIN)" == "10.9" && "$(VBOX_XCODE_VERSION)" == "6.2" # 'effing 10.9 SDK in Xcode 6.2 is missing python. Stupid, stupid Apple!!
-   VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK)/../MacOSX10.10.sdk/System/Library/Frameworks/Python.framework/Versions/2.6/Headers
-   VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK)/../MacOSX10.10.sdk/System/Library/Frameworks/Python.framework/Versions/2.6/Python
-  else if "$(VBOX_DEF_MACOSX_VERSION_MIN)" vlt "10.13"
-   VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Versions/2.6/Headers
-   VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Versions/2.6/Python$(VBOX_PYTHON_SUFFTBD)
-  endif
-  if !defined(VBOX_OSE) || "$(wildcard $(VBOX_PYTHON26_LIB))" != ""
-   VBOX_PYTHON26_LIB_X86 = $(VBOX_PYTHON26_LIB)
-  else
-   VBOX_PYTHON26_INC =
-   VBOX_PYTHON26_LIB =
-  endif
- endif
- ifndef VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_7
-  if1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.6 10.5 10.4)
-   VBOX_PYTHON27_INC = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/include/python2.7
-   VBOX_PYTHON27_LIB = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib
-  else if "$(VBOX_DEF_MACOSX_VERSION_MIN)" == "10.9" && "$(VBOX_XCODE_VERSION)" == "6.2" # 'effing 10.9 SDK in Xcode 6.2 is missing python. Stupid, stupid Apple!!
-   VBOX_PYTHON27_INC = $(VBOX_PATH_MACOSX_SDK)/../MacOSX10.10.sdk/System/Library/Frameworks/Python.framework/Versions/2.7/Headers
-   VBOX_PYTHON27_LIB = $(VBOX_PATH_MACOSX_SDK)/../MacOSX10.10.sdk/System/Library/Frameworks/Python.framework/Versions/2.7/Python
-  else
-   VBOX_PYTHON27_INC = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Versions/2.7/Headers
-   VBOX_PYTHON27_LIB = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Versions/2.7/Python$(VBOX_PYTHON_SUFFTBD)
-  endif
-  if !defined(VBOX_OSE) || "$(wildcard $(VBOX_PYTHON27_LIB))" != ""
-   VBOX_PYTHON27_LIB_X86 = $(VBOX_PYTHON27_LIB)
-  else
-   VBOX_PYTHON27_INC =
-   VBOX_PYTHON27_LIB =
-  endif
+ if1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.5 10.4)
+  VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/include/python2.6
+  VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib
+ else if "$(VBOX_DEF_MACOSX_VERSION_MIN)" == "10.9" && "$(VBOX_XCODE_VERSION)" == "6.2" # 'effing 10.9 SDK in Xcode 6.2 is missing python. Stupid, stupid Apple!!
+  VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK)/../MacOSX10.10.sdk/System/Library/Frameworks/Python.framework/Versions/2.6/Headers
+  VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK)/../MacOSX10.10.sdk/System/Library/Frameworks/Python.framework/Versions/2.6/Python
+ else if "$(VBOX_DEF_MACOSX_VERSION_MIN)" vlt "10.13"
+  VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Versions/2.6/Headers
+  VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Versions/2.6/Python$(VBOX_PYTHON_SUFFTBD)
+ endif
+ if !defined(VBOX_OSE) || "$(wildcard $(VBOX_PYTHON26_LIB))" != ""
+  VBOX_PYTHON26_LIB_X86 = $(VBOX_PYTHON26_LIB)
+ else
+  VBOX_PYTHON26_INC =
+  VBOX_PYTHON26_LIB =
+ endif
+
+ if1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.6 10.5 10.4)
+  VBOX_PYTHON27_INC = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/include/python2.7
+  VBOX_PYTHON27_LIB = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib
+ else if "$(VBOX_DEF_MACOSX_VERSION_MIN)" == "10.9" && "$(VBOX_XCODE_VERSION)" == "6.2" # 'effing 10.9 SDK in Xcode 6.2 is missing python. Stupid, stupid Apple!!
+  VBOX_PYTHON27_INC = $(VBOX_PATH_MACOSX_SDK)/../MacOSX10.10.sdk/System/Library/Frameworks/Python.framework/Versions/2.7/Headers
+  VBOX_PYTHON27_LIB = $(VBOX_PATH_MACOSX_SDK)/../MacOSX10.10.sdk/System/Library/Frameworks/Python.framework/Versions/2.7/Python
+ else
+  VBOX_PYTHON27_INC = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Versions/2.7/Headers
+  VBOX_PYTHON27_LIB = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Versions/2.7/Python$(VBOX_PYTHON_SUFFTBD)
+ endif
+ if !defined(VBOX_OSE) || "$(wildcard $(VBOX_PYTHON27_LIB))" != ""
+  VBOX_PYTHON27_LIB_X86 = $(VBOX_PYTHON27_LIB)
+ else
+  VBOX_PYTHON27_INC =
+  VBOX_PYTHON27_LIB =
  endif
  # No Python 3.x yet as part of OSX versions including El Capitan, 10.11.