Changeset 39207 in vbox for trunk/src/libs/xpcom18a4/python

Timestamp:

Nov 4, 2011 4:09:25 PM (13 years ago)

Author:

vboxsync

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

74720

Message:

python on lion, hacking in progress...

Location:

trunk/src/libs/xpcom18a4/python

Files:

• Makefile.kmk (modified) (8 diffs)
• gen_python_deps.py (modified) (1 diff)

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

@@ -29 +29 @@
 # VBOX_PYTHON[25|26|27|28|DEF]_[INC|LIB] variables which get picked up below.
 #
-$(eval $(subst |,$(NL),$(shell $(VBOX_BLD_PYTHON) $(PATH_SUB_CURRENT)/gen_python_deps.py $(KBUILD_TARGET) $(KBUILD_TARGET_ARCH) $(VBOX_MULTIPYTHON))))
+ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script.
+ ifeq ($(KBUILD_TARGET_ARCH),x86)
+  VBOX_PYTHON25_INC = $(VBOX_PATH_MACOSX_SDK)/usr/include/python2.5
+  VBOX_PYTHON25_LIB = $(VBOX_PATH_MACOSX_SDK)/usr/lib/libpython2.5.dylib
+ endif
+ if  !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6) \
+  && (   !defined(VBOX_OSE) \
+      || "$(wildcard $(VBOX_PATH_MACOSX_SDK)/usr/lib/libpython2.6.dylib)" != "")
+  VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK)/usr/include/python2.6
+  VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK)/usr/lib/libpython2.6.dylib
+ endif
+ if  !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_7) \
+  && (   defined(VBOX_NOT_OSE_LATER_SOMETIME) \
+      || "$(wildcard $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib)" != "")
+  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
+ endif
+else
+ # Use the script.
+ $(eval $(subst |,$(NL),$(shell $(VBOX_BLD_PYTHON) \
+        $(PATH_SUB_CURRENT)/gen_python_deps.py \
+            $(KBUILD_TARGET) \
+            $(KBUILD_TARGET_ARCH) \
+            $(VBOX_MULTIPYTHON) )))
+endif
 
 ifndef VBOX_ONLY_SDK
@@ -77 +101 @@
 
 
-if defined(VBOX_PYTHON23_INC) \
-  && ("$(KBUILD_TARGET)" != "darwin" || ("$(KBUILD_TARGET_ARCH)" == "x86" && defined(VBOX_WITH_MAC_OS_X_10_4_SUPPORT) ))
+ifdef VBOX_PYTHON23_INC
 #
 # Python 2.3 version
@@ -90 +113 @@
 endif
 
-if defined(VBOX_PYTHON24_INC) && "$(KBUILD_TARGET)" != "darwin"
+ifdef VBOX_PYTHON24_INC
 #
 # Python 2.4 version
@@ -101 +124 @@
 endif
 
-if defined(VBOX_PYTHON25_INC) \
-  && ("$(KBUILD_TARGET)" != "darwin" || ("$(KBUILD_TARGET_ARCH)" == "x86" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" == "10.5"))
+ifdef VBOX_PYTHON25_INC
 #
 # Python 2.5 version
@@ -114 +136 @@
 endif
 
-if defined(VBOX_PYTHON26_INC) \
-  && ("$(KBUILD_TARGET)" != "darwin" || "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.6")
+ifdef VBOX_PYTHON26_INC
 #
 # Python 2.6 version
@@ -127 +148 @@
 endif
 
-if defined(VBOX_PYTHON27_INC) && "$(KBUILD_TARGET)" != "darwin"
+ifdef VBOX_PYTHON27_INC
 #
 # Python 2.7 version
@@ -134 +155 @@
 VBoxPython2_7_EXTENDS    = VBoxPythonBase
 VBoxPython2_7_EXTENDS_BY = appending
+VBoxPython2_6_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin",OSX107,)
 VBoxPython2_7_INCS       = $(VBOX_PYTHON27_INC)
 VBoxPython2_7_LIBS       = $(VBOX_PYTHON27_LIB)
 endif
 
-if defined(VBOX_PYTHON28_INC) && "$(KBUILD_TARGET)" != "darwin"
+ifdef VBOX_PYTHON28_INC
 #
 # Python 2.8 version
@@ -149 +171 @@
 endif
 
-if defined(VBOX_PYTHONDEF_INC) && "$(KBUILD_TARGET)" != "darwin"
+ifdef VBOX_PYTHONDEF_INC
 #
 # Python without versioning

trunk/src/libs/xpcom18a4/python/gen_python_deps.py

@@ -75 +75 @@
     if target == 'darwin':
         ## @todo Pick up the locations from VBOX_PATH_MACOSX_SDK_10_*.
-        prefixes = ['/Developer/SDKs/MacOSX10.4u.sdk/usr', '/Developer/SDKs/MacOSX10.5.sdk/usr', '/Developer/SDKs/MacOSX10.6.sdk/usr']
+        prefixes = ['/Developer/SDKs/MacOSX10.4u.sdk/usr',
+                    '/Developer/SDKs/MacOSX10.5.sdk/usr',
+                    '/Developer/SDKs/MacOSX10.6.sdk/usr',
+                    '/Developer/SDKs/MacOSX10.7.sdk/usr']
         dllsuff = '.dylib'