diff options
author | Marc Khouzam | 2016-01-20 02:59:23 +0000 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org | 2016-01-21 00:17:44 +0000 |
commit | 5af6c7413ab711dfd4cc998ded904d74bef6feee (patch) | |
tree | 53461eeb5e57ebe908a09c172189085e62e172d8 /jtag/org.eclipse.cdt.debug.gdbjtag.core | |
parent | 9066b061f391cc18ee1d185b37c4e3e5eb1160e6 (diff) | |
download | org.eclipse.cdt-5af6c7413ab711dfd4cc998ded904d74bef6feee.tar.gz org.eclipse.cdt-5af6c7413ab711dfd4cc998ded904d74bef6feee.tar.xz org.eclipse.cdt-5af6c7413ab711dfd4cc998ded904d74bef6feee.zip |
Bug 486148: Remove support for Apple GDB
The following macos packages were removed:
org.eclipse.cdt.dsf.gdb.service.macos,
org.eclipse.cdt.dsf.mi.service.command.commands.macos,
org.eclipse.cdt.dsf.mi.service.command.output.macos
org.eclipse.cdt.debug.gdbjtag.core.dsf.gdb.service.macos
The following classes, contained in the above packages are now removed:
MacOSCommandFactory.java
MacOSGDBProcesses.java
MacOSGDBRunControl.java
MacOSGdbDebugServicesFactory.java
MacOSMIEnvironmentCD.java
MacOSMIVarUpdate.java
MacOSMIVarUpdateInfo.java
MacOSGdbJtagDebugServicesFactory.java
The constant LaunchUtils.MACOS_GDB_MARKER was removed.
Change-Id: Iea54886a02015dd0b11678a0cd5d911bed129485
Diffstat (limited to 'jtag/org.eclipse.cdt.debug.gdbjtag.core')
4 files changed, 2 insertions, 44 deletions
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF b/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF index d798c7dbcf3..eb386f2d677 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.debug.gdbjtag.core;singleton:=true -Bundle-Version: 8.5.0.qualifier +Bundle-Version: 9.0.0.qualifier Bundle-Activator: org.eclipse.cdt.debug.gdbjtag.core.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, @@ -18,7 +18,6 @@ Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.cdt.debug.gdbjtag.core, org.eclipse.cdt.debug.gdbjtag.core.dsf.gdb.service, org.eclipse.cdt.debug.gdbjtag.core.dsf.gdb.service.extensions, - org.eclipse.cdt.debug.gdbjtag.core.dsf.gdb.service.macos, org.eclipse.cdt.debug.gdbjtag.core.jtagdevice Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/pom.xml b/jtag/org.eclipse.cdt.debug.gdbjtag.core/pom.xml index dd4860874f5..10ed59e5155 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/pom.xml +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/pom.xml @@ -11,7 +11,7 @@ <relativePath>../../pom.xml</relativePath> </parent> - <version>8.5.0-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <artifactId>org.eclipse.cdt.debug.gdbjtag.core</artifactId> <packaging>eclipse-plugin</packaging> </project> diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFLaunchConfigurationDelegate.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFLaunchConfigurationDelegate.java index 525583773f9..1aa179f0529 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFLaunchConfigurationDelegate.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFLaunchConfigurationDelegate.java @@ -18,7 +18,6 @@ package org.eclipse.cdt.debug.gdbjtag.core; */ import org.eclipse.cdt.debug.gdbjtag.core.dsf.gdb.service.GdbJtagDebugServicesFactory; -import org.eclipse.cdt.debug.gdbjtag.core.dsf.gdb.service.macos.MacOSGdbJtagDebugServicesFactory; import org.eclipse.cdt.dsf.concurrent.ThreadSafe; import org.eclipse.cdt.dsf.debug.service.IDsfDebugServicesFactory; import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants; @@ -46,15 +45,6 @@ public class GDBJtagDSFLaunchConfigurationDelegate extends GdbLaunchDelegate { @Override protected IDsfDebugServicesFactory newServiceFactory(ILaunchConfiguration config, String version) { - if (version.contains(LaunchUtils.MACOS_GDB_MARKER)) { - // The version string at this point should look like - // 6.3.50-20050815APPLE1346, we extract the gdb version and apple version - String versions [] = version.split(LaunchUtils.MACOS_GDB_MARKER); - if (versions.length == 2) { - return new MacOSGdbJtagDebugServicesFactory(versions[0], versions[1]); - } - } - return new GdbJtagDebugServicesFactory(version); } diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/macos/MacOSGdbJtagDebugServicesFactory.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/macos/MacOSGdbJtagDebugServicesFactory.java deleted file mode 100644 index 92eebfd7b37..00000000000 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/macos/MacOSGdbJtagDebugServicesFactory.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2014 Ericsson and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Ericsson - Initial implementation - *******************************************************************************/ -package org.eclipse.cdt.debug.gdbjtag.core.dsf.gdb.service.macos; - -import org.eclipse.cdt.debug.gdbjtag.core.dsf.gdb.service.GDBJtagControl; -import org.eclipse.cdt.dsf.debug.service.command.ICommandControl; -import org.eclipse.cdt.dsf.gdb.service.macos.MacOSCommandFactory; -import org.eclipse.cdt.dsf.gdb.service.macos.MacOSGdbDebugServicesFactory; -import org.eclipse.cdt.dsf.service.DsfSession; -import org.eclipse.debug.core.ILaunchConfiguration; - -/** @since 8.4*/ -public class MacOSGdbJtagDebugServicesFactory extends MacOSGdbDebugServicesFactory { - - public MacOSGdbJtagDebugServicesFactory(String gdbVersion, String appleVersion) { - super(gdbVersion, appleVersion); - } - - @Override - protected ICommandControl createCommandControl(DsfSession session, ILaunchConfiguration config) { - return new GDBJtagControl(session, config, new MacOSCommandFactory()); - } -} |