Debugger: Remove hard coded python path for LLDB modules on Mac

Change-Id: I4229792171edef807619ec4e68393ec3e90e12dc
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2013-05-23 13:08:48 +02:00
parent 98856feeea
commit 1cc957d47b
+7 -17
View File
@@ -3,29 +3,22 @@ import atexit
import binascii
import inspect
import os
import platform
import threading
import select
import sys
import subprocess
uname = platform.uname()[0]
if uname == 'Linux':
# /data/dev/llvm-git-2/build/lib/python2.7/site-packages
proc = subprocess.Popen(args=[sys.argv[1], "-P"], stdout=subprocess.PIPE)
path = proc.stdout.read().strip()
sys.path.append(path)
else:
base = '/Applications/Xcode.app/Contents/'
sys.path.append(base + 'SharedFrameworks/LLDB.framework/Resources/Python')
sys.path.append(base + 'Library/PrivateFrameworks/LLDB.framework/Resources/Python')
proc = subprocess.Popen(args=[sys.argv[1], "-P"], stdout=subprocess.PIPE)
path = proc.stdout.read().strip()
#sys.path.append(path)
sys.path.insert(1, path)
import lldb
cdbLoaded = False
lldbLoaded = True
gdbLoaded = False
lldbLoaded = True
# Encodings. Keep that synchronized with DebuggerEncoding in watchutils.h
Unencoded8Bit, \
@@ -825,9 +818,7 @@ class Dumper:
typeName = value.GetTypeName()
# Handle build-in LLDB visualizers if wanted.
hasSynth = hasattr(value, 'SetPreferSyntheticValue')
if self.useLldbDumpers and hasSynth and value.GetTypeSynthetic().IsValid():
if self.useLldbDumpers and value.GetTypeSynthetic().IsValid():
# FIXME: print "official" summary?
summary = value.GetTypeSummary()
if summary.IsValid():
@@ -852,8 +843,7 @@ class Dumper:
return
# Our turf now.
if hasSynth:
value.SetPreferSyntheticValue(False)
value.SetPreferSyntheticValue(False)
# References
if value.GetType().IsReferenceType():