diff options
4 files changed, 38 insertions, 3 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.core.cdt/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.core.cdt/META-INF/MANIFEST.MF index 881037d57..d093a602f 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.core.cdt/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.core.cdt/META-INF/MANIFEST.MF @@ -7,10 +7,13 @@ Bundle-Activator: org.eclipse.tcf.te.core.cdt.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.cdt.core;bundle-version="5.4.0";visibility:=reexport, - org.eclipse.tcf.te.runtime;bundle-version="1.1.0" + org.eclipse.tcf.te.runtime;bundle-version="1.1.0", + org.eclipse.cdt.debug.core;bundle-version="7.2.0", + org.eclipse.debug.core;bundle-version="3.7.100" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Export-Package: org.eclipse.tcf.te.core.cdt.activator;x-internal:=true, +Export-Package: org.eclipse.tcf.te.core.cdt, + org.eclipse.tcf.te.core.cdt.activator;x-internal:=true, org.eclipse.tcf.te.core.cdt.elf, org.eclipse.tcf.te.core.cdt.nls;x-internal:=true diff --git a/target_explorer/plugins/org.eclipse.tcf.te.core.cdt/src/org/eclipse/tcf/te/core/cdt/CdtUtils.java b/target_explorer/plugins/org.eclipse.tcf.te.core.cdt/src/org/eclipse/tcf/te/core/cdt/CdtUtils.java new file mode 100644 index 000000000..bf4e8adba --- /dev/null +++ b/target_explorer/plugins/org.eclipse.tcf.te.core.cdt/src/org/eclipse/tcf/te/core/cdt/CdtUtils.java @@ -0,0 +1,24 @@ +/******************************************************************************* + * Copyright (c) 2012 Wind River Systems, Inc. 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: + * Wind River Systems - initial API and implementation + *******************************************************************************/ +package org.eclipse.tcf.te.core.cdt; + +import org.eclipse.cdt.debug.core.CDebugCorePlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector; + +/** + * Provides CDT utilities. + */ +public final class CdtUtils { + + public static ISourceLookupDirector getDefaultSourceLookupDirector() throws CoreException { + return CDebugCorePlugin.getDefault().getCommonSourceLookupDirector(); + } +} diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/META-INF/MANIFEST.MF index c1c711f54..7e3f6a2fd 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/META-INF/MANIFEST.MF @@ -20,7 +20,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.tcf.te.tcf.core;bundle-version="1.1.0", org.eclipse.tcf.te.tcf.filesystem.core;bundle-version="1.1.0", org.eclipse.tcf.te.tcf.locator;bundle-version="1.1.0", - org.eclipse.tcf.te.tcf.processes.core;bundle-version="1.1.0" + org.eclipse.tcf.te.tcf.processes.core;bundle-version="1.1.0", + org.eclipse.tcf.te.core.cdt;bundle-version="1.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/lm/delegates/AttachLaunchManagerDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/lm/delegates/AttachLaunchManagerDelegate.java index 72043a891..446e3c8ca 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/lm/delegates/AttachLaunchManagerDelegate.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/lm/delegates/AttachLaunchManagerDelegate.java @@ -17,6 +17,7 @@ import java.util.List; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.tcf.internal.debug.launch.TCFLaunchDelegate; +import org.eclipse.tcf.te.core.cdt.CdtUtils; import org.eclipse.tcf.te.launch.core.lm.delegates.DefaultLaunchManagerDelegate; import org.eclipse.tcf.te.launch.core.lm.interfaces.ILaunchContextLaunchAttributes; import org.eclipse.tcf.te.launch.core.lm.interfaces.ILaunchSpecification; @@ -66,6 +67,12 @@ public class AttachLaunchManagerDelegate extends DefaultLaunchManagerDelegate { wc.setAttribute(IAttachLaunchAttributes.ATTR_ATTACH_SERVICES, (List<?>)null); wc.setAttribute(TCFLaunchDelegate.ATTR_DISCONNECT_ON_CTX_EXIT, false); + try { + wc.setAttribute(ILaunchConfiguration.ATTR_SOURCE_LOCATOR_MEMENTO, CdtUtils.getDefaultSourceLookupDirector().getMemento()); + } + catch (Exception e) { + + } copySpecToConfig(launchSpec, wc); wc.rename(getDefaultLaunchName(wc)); |