Changeset 28292 in vbox for trunk/src/VBox

Timestamp:

Apr 14, 2010 10:54:32 AM (15 years ago)

Author:

vboxsync

Message:

Python: OSX SDK searching

Location:

trunk/src/VBox

Files:

• Installer/common/vboxapisetup.py (modified) (3 diffs)
• Main/glue/vboxapi.py (modified) (2 diffs)

trunk/src/VBox/Installer/common/vboxapisetup.py

@@ -17 +17 @@
 from distutils.core import setup
 
-def patchWith(file,install):
+def patchWith(file,install,sdk):
     newFile=file+".new"
-    install=install.replace("\\", "\\\\") 
-    try: 
+    install=install.replace("\\", "\\\\")
+    try:
         os.remove(newFile)
     except:
@@ -28 +28 @@
     for line in oldF:
         line=line.replace("%VBOX_INSTALL_PATH%",install)
+        line=line.replace("%VBOX_SDK_PATH%",sdk)
         newF.write(line)
     newF.close()
     oldF.close()
-    try: 
+    try:
         os.remove(file)
     except:
@@ -46 +47 @@
         # Should we use VBox version for binding module versioning?
         vboxVersion = "1.0"
-        #raise Exception("No VBOX_VERSION defined, exiting")
-    patchWith(os.path.join(os.path.dirname(sys.argv[0]), 'vboxapi', '__init__.py'), vboxDest)
+    import platform
+    if platform.system() == 'Darwin':
+        vboxSdkDest = os.path.join(vboxDest, "..", "..", "..", "sdk")
+    else:
+        vboxSdkDest = os.path.join(vboxDest, "sdk")
+    patchWith(os.path.join(os.path.dirname(sys.argv[0]), 'vboxapi', '__init__.py'), vboxDest, vboxSdkDest)
     setup(name='vboxapi',
       version=vboxVersion,
       description='Python interface to VirtualBox',
-      author='Sun Microsystems',
+      author='Oracle Corp.',
       author_email='[email protected]',
       url='http://www.virtualbox.org',

trunk/src/VBox/Main/glue/vboxapi.py

@@ -17 +17 @@
 import traceback
 
+# To set Python bitness on OSX use 'export VERSIONER_PYTHON_PREFER_32_BIT=yes'
+
 VboxBinDir = os.environ.get("VBOX_PROGRAM_PATH", None)
 VboxSdkDir = os.environ.get("VBOX_SDK_PATH", None)
@@ -25 +27 @@
 
 if VboxSdkDir is None:
-    VboxSdkDir = os.path.join(VboxBinDir,"sdk")
+    # Will be set by the installer
+    VboxSdkDir = "%VBOX_SDK_PATH%"
 
 os.environ["VBOX_PROGRAM_PATH"] = VboxBinDir