mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-03-28 14:56:28 +01:00
Code Issues Wiki Activity

lldb: Add new version info in the comments

Browse source 
The main LLDB code base doesn't include lldb-mi anymore
and it means Xcode 11 doesn't include it either.

Change-Id: I1c16a2d579c40ced305a225469f91a57041ee606
Signed-off-by: Marc-Andre Laperle <malaperle@gmail.com>
This commit is contained in:
Marc-Andre Laperle 2019-10-20 23:33:09 -04:00 • committed by Marc-André Laperle
parent 092b4ed3cf
commit e391b182cb
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
llvm/org.eclipse.cdt.llvm.dsf.lldb.core/META-INF/MANIFEST.MF
View file

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.cdt.llvm.dsf.lldb.core;singleton:=true
Bundle-Version: 1.0.1.qualifier
Bundle-Version: 1.100.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: plugin
Require-Bundle: org.eclipse.debug.core,

7
llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/LLDBPreferenceInitializer.java
View file

@ -26,11 +26,12 @@ import org.eclipse.core.runtime.preferences.IEclipsePreferences;
*/
public class LLDBPreferenceInitializer extends AbstractPreferenceInitializer {
private static final String XCODE_BUNDLED_LLDB_PATH = "/Applications/Xcode.app/Contents/Developer/usr/bin/lldb-mi"; //$NON-NLS-1$
private static final String XCODE_BUNDLED_LLDB_MI_PATH = "/Applications/Xcode.app/Contents/Developer/usr/bin/lldb-mi"; //$NON-NLS-1$
private static String getDefaultCommand() {
if (Platform.getOS().equals(Platform.OS_MACOSX) && new File(XCODE_BUNDLED_LLDB_PATH).exists()) {
return XCODE_BUNDLED_LLDB_PATH;
// Note: As of Xcode 11.1, lldb-mi is not included anymore
if (Platform.getOS().equals(Platform.OS_MACOSX) && new File(XCODE_BUNDLED_LLDB_MI_PATH).exists()) {
return XCODE_BUNDLED_LLDB_MI_PATH;
}
return ILLDBLaunchConfigurationConstants.DEBUGGER_DEBUG_NAME_DEFAULT;
}

1
llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/LLDBLaunch.java
View file

@ -234,6 +234,7 @@ public class LLDBLaunch extends GdbLaunch {
// 370.0.40 => Xcode 8.3.1
// 902.0.79.7 => Xcode 9.4.1
// 1000.11.37.1 => Xcode 10.0
// 1100.0.28.19 => Xcode 11.1 (lldb-mi not included anymore)
//
// Note that a LLDB built from source on macOS can report the same
// Apple-style version even for different LLDB/Clang-style version