Changeset 39207 in vbox

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

Files:

• configure (modified) (4 diffs)
• src/VBox/Installer/darwin/Makefile.kmk (modified) (1 diff)
• src/libs/xpcom18a4/Config.kmk (modified) (1 diff)
• src/libs/xpcom18a4/python/Makefile.kmk (modified) (8 diffs)
• src/libs/xpcom18a4/python/gen_python_deps.py (modified) (1 diff)

trunk/configure

@@ -2077 +2077 @@
       sdk=/Developer/SDKs/MacOSX10.6.sdk
       CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
-      # We disable the java stuff until Apple make the java stuff downloadable.
-      WITH_JAVA=0
       ;;
     10\.*)
@@ -2092 +2090 @@
 #      test "$CC" = "gcc" && CC="gcc-4.0"
 #      test "$CXX" = "g++" && CXX="g++-4.0"
+      cnf_append "VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_7" "1"
       ;;
     9\.*)
@@ -2100 +2099 @@
 #      test "$CXX" = "g++" && CXX="g++-4.0"
       cnf_append "VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6" "1"
+      cnf_append "VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_7" "1"
       ;;
     8\.*)
@@ -2109 +2109 @@
       cnf_append "VBOX_WITH_COCOA_QT" ""
       cnf_append "VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6" "1"
+      cnf_append "VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_7" "1"
       ;;
     *)

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

@@ -589 +589 @@
         MacOS/VBoxPython2_6.so
 endif
+#if defined(VBOX_WITH_PYTHON) && !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_7)
+# VBOX_DI_VBAPP_DYLIBS += \
+#       MacOS/VBoxPython2_7.so
+#endif
 
 VBOX_DI_VBAPP_DYLIBS.x86 := \

trunk/src/libs/xpcom18a4/Config.kmk

@@ -251 +251 @@
 TEMPLATE_XPCOMOSX106_DEFS.darwin        = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPCOM_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_6_DEFS)
 TEMPLATE_XPCOMOSX106_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_6)/Developer/Headers/FlatCarbon
+
+#
+# Template for building VBoxPhython against the Mac OS X 10.7 SDK.
+# ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
+#
+TEMPLATE_XPCOMOSX107                    = XPCOM libraries (shared) built against the Mac OS X 10.7 SDK
+TEMPLATE_XPCOMOSX107_EXTENDS            = XPCOM
+TEMPLATE_XPCOMOSX107_CXXFLAGS.darwin    = $(filter-out $(VBOX_DARWIN_DEF_SDK_CXXFLAGS),$(TEMPLATE_XPCOM_CXXFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_7_CXXFLAGS)
+TEMPLATE_XPCOMOSX107_CFLAGS.darwin      = $(filter-out $(VBOX_DARWIN_DEF_SDK_CFLAGS),$(TEMPLATE_XPCOM_CFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_7_CFLAGS)
+TEMPLATE_XPCOMOSX107_LDFLAGS.darwin     = $(filter-out $(VBOX_DARWIN_DEF_SDK_LDFLAGS),$(TEMPLATE_XPCOM_LDFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_7_LDFLAGS)
+TEMPLATE_XPCOMOSX107_DEFS.darwin        = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPCOM_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_7_DEFS)
+TEMPLATE_XPCOMOSX107_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_7)/Developer/Headers/FlatCarbon
 
 

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'