Target Explorer: Added TCF based launcher contribution for C/C++ Attach to Application launch

4 files changed, 116 insertions, 26 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/OSGI-INF/l10n/bundle.properties b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/OSGI-INF/l10n/bundle.properties
index 2516a71b0..906def728 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/OSGI-INF/l10n/bundle.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/OSGI-INF/l10n/bundle.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2013 MontaVista Software, LLC. and others. All rights reserved.
+# Copyright (c) 2013, 2015 MontaVista Software, LLC. 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
@@ -14,4 +14,6 @@ Vendor-Name = Eclipse.org - Target Explorer
 tedsfLaunchDelegate.name = GDB (DSF) Automatic Remote Debugging via TCF/TE
 tedsfLaunchDelegate.description = Automatically start and debug a new application on a remote system under control of GDB debugger integrated using the Debugger Services Framework (DSF) over TCF/TE.
 terunLaunchDelegate.name = Remote Launching via TCF/TE
-terunLaunchDelegate.description = Automatically start a new application on a remote system over TCF/TE.
\ No newline at end of file
+terunLaunchDelegate.description = Automatically start a new application on a remote system over TCF/TE.
+teattachLaunchDelegate.name = GDB (DSF) Attach to Process via TCF/TE
+teattachLaunchDelegate.description = Attach the GDB debugger, integrated using the Debugger Services Framework (DSF), to a running program locally or remotely over TCF/TE.
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/plugin.xml
index 4b8d13aa1..ef67becd7 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (c) 2006, 2012 PalmSource, Inc. and others
+Copyright (c) 2006, 2015 PalmSource, 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 
@@ -15,7 +15,7 @@ Anna Dushistova  (MontaVista)      - adapted from org.eclipse.cdt.launch.remote
 -->
 <?eclipse version="3.0"?>
 <plugin>
-       <extension point="org.eclipse.debug.core.launchDelegates">
+   <extension point="org.eclipse.debug.core.launchDelegates">
       <launchDelegate
             id="org.eclipse.tcf.te.remotecdt.dsf.debug"
             type="org.eclipse.cdt.launch.remoteApplicationLaunchType"
@@ -33,38 +33,60 @@ Anna Dushistova  (MontaVista)      - adapted from org.eclipse.cdt.launch.remote
             delegate="org.eclipse.tcf.te.tcf.launch.cdt.launching.TERunLaunchDelegate"
             name="%terunLaunchDelegate.name"
             delegateDescription="%terunLaunchDelegate.description">
+      </launchDelegate>
+      <launchDelegate
+            id="org.eclipse.tcf.te.remotecdt.dsf.attach"
+            type="org.eclipse.cdt.launch.attachLaunchType"
+            modes="debug"
+            delegate="org.eclipse.tcf.te.tcf.launch.cdt.launching.TEGdbAttachLaunchDelegate"
+            name="%teattachLaunchDelegate.name"
+            delegateDescription="%teattachLaunchDelegate.description"
+            sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
+            sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
       </launchDelegate>      
+           
    </extension>
    
-   <extension
-         point="org.eclipse.debug.ui.launchConfigurationTabs">
-     <tab
-            id="org.eclipse.tcf.te.remotecdt.dsf.gdb.mainTab"
-            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
-            name="Main"
-            class="org.eclipse.tcf.te.tcf.launch.cdt.tabs.TECDSFMainTab">
-        <associatedDelegate delegate="org.eclipse.tcf.te.remotecdt.dsf.debug"/>
-     </tab>
-     <tab
+   <extension point="org.eclipse.debug.ui.launchConfigurationTabs">
+      <!-- Remote Application (Run) -->
+      <tab
             id="org.eclipse.tcf.te.remotecdt.run.mainTab"
             group="org.eclipse.cdt.launch.remoteApplicationRunLaunchTabGroup"
             name="Main"
             class="org.eclipse.tcf.te.tcf.launch.cdt.tabs.TECDSFMainTab">
-        <associatedDelegate delegate="org.eclipse.tcf.te.remotecdt.run"/>
-     </tab>         
-      <tab id="org.eclipse.tcf.te.remotecdt.dsf.debug.CArgumentsTab"
-            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
+         <associatedDelegate delegate="org.eclipse.tcf.te.remotecdt.run"/>
+      </tab>         
+      <tab id="org.eclipse.tcf.te.remotecdt.run.CArgumentsTab"
+            group="org.eclipse.cdt.launch.remoteApplicationRunLaunchTabGroup"
             name="Arguments"
             class="org.eclipse.cdt.dsf.gdb.internal.ui.launching.CArgumentsTab">
-        <associatedDelegate delegate="org.eclipse.tcf.te.remotecdt.dsf.debug"/>
+        <associatedDelegate delegate="org.eclipse.tcf.te.remotecdt.run"/>
         <placement after="org.eclipse.tcf.te.remotecdt.dsf.gdb.mainTab"/>
       </tab>
-      <tab id="org.eclipse.tcf.te.remotecdt.run.CArgumentsTab"
+      <tab
+            id="org.eclipse.tcf.te.remotecdt.CommonTab"
             group="org.eclipse.cdt.launch.remoteApplicationRunLaunchTabGroup"
+            name="Common"
+            class="org.eclipse.debug.ui.CommonTab">
+        <associatedDelegate delegate="org.eclipse.tcf.te.remotecdt.run"/>
+        <placement after="org.eclipse.cdt.dsf.gdb.launch.argumentsTab"/>
+      </tab>
+
+      <!-- Remote Application (Debug) -->
+      <tab
+            id="org.eclipse.tcf.te.remotecdt.dsf.gdb.mainTab"
+            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
+            name="Main"
+            class="org.eclipse.tcf.te.tcf.launch.cdt.tabs.TECDSFMainTab">
+         <associatedDelegate delegate="org.eclipse.tcf.te.remotecdt.dsf.debug"/>
+      </tab>
+      <tab 
+            id="org.eclipse.tcf.te.remotecdt.dsf.debug.CArgumentsTab"
+            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
             name="Arguments"
             class="org.eclipse.cdt.dsf.gdb.internal.ui.launching.CArgumentsTab">
-        <associatedDelegate delegate="org.eclipse.tcf.te.remotecdt.run"/>
-        <placement after="org.eclipse.tcf.te.remotecdt.dsf.gdb.mainTab"/>
+         <associatedDelegate delegate="org.eclipse.tcf.te.remotecdt.dsf.debug"/>
+         <placement after="org.eclipse.tcf.te.remotecdt.dsf.gdb.mainTab"/>
       </tab>
       <tab id="org.eclipse.tcf.te.remotecdt.dsf.debug.RemoteCDSFDebuggerTab"
             group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
@@ -89,13 +111,39 @@ Anna Dushistova  (MontaVista)      - adapted from org.eclipse.cdt.launch.remote
         <associatedDelegate delegate="org.eclipse.tcf.te.remotecdt.dsf.debug"/>
         <placement after="org.eclipse.debug.ui.sourceLookupTab"/>                
       </tab>         
+
+      <!-- Attach Launch -->
       <tab
-            id="org.eclipse.tcf.te.remotecdt.CommonTab"
-            group="org.eclipse.cdt.launch.remoteApplicationRunLaunchTabGroup"
+            id="org.eclipse.tcf.te.remotecdt.attach.mainTab"
+            group="org.eclipse.cdt.launch.attachLaunchTabGroup"
+            name="Main"
+            class="org.eclipse.tcf.te.tcf.launch.cdt.tabs.TECDSFMainAttachTab">
+         <associatedDelegate delegate="org.eclipse.tcf.te.remotecdt.dsf.attach"/>
+      </tab>
+      <tab
+            id="org.eclipse.tcf.te.remotecdt.attach.debuggerTab"
+            group="org.eclipse.cdt.launch.attachLaunchTabGroup"
+            name="Debugger"
+            class="org.eclipse.cdt.dsf.gdb.internal.ui.launching.AttachCDebuggerTab">
+        <associatedDelegate delegate="org.eclipse.tcf.te.remotecdt.dsf.attach"/>
+        <placement after="org.eclipse.cdt.dsf.gdb.launch.mainTab"/>
+      </tab>
+      <tab
+            id="org.eclipse.tcf.te.remotecdt.attach.sourceLookupTab"
+            group="org.eclipse.cdt.launch.attachLaunchTabGroup"
+            name="Source"
+            class="org.eclipse.debug.ui.sourcelookup.SourceLookupTab">
+        <associatedDelegate delegate="org.eclipse.tcf.te.remotecdt.dsf.attach"/>
+        <placement after="org.eclipse.cdt.dsf.gdb.launch.debuggerTab"/>
+      </tab>
+      <tab
+            id="org.eclipse.tcf.te.remotecdt.attach.commonTab"
+            group="org.eclipse.cdt.launch.attachLaunchTabGroup"
             name="Common"
             class="org.eclipse.debug.ui.CommonTab">
-        <associatedDelegate delegate="org.eclipse.tcf.te.remotecdt.run"/>
-        <placement after="org.eclipse.cdt.dsf.gdb.launch.argumentsTab"/>
+        <associatedDelegate delegate="org.eclipse.tcf.te.remotecdt.dsf.attach"/>
+        <placement after="org.eclipse.debug.ui.sourceLookupTab"/>
       </tab>
+
    </extension>
 </plugin>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbAttachLaunchDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbAttachLaunchDelegate.java
new file mode 100644
index 000000000..3eb444a26
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbAttachLaunchDelegate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.tcf.launch.cdt.launching;
+
+import org.eclipse.cdt.dsf.gdb.launching.GdbAttachLaunchDelegate;
+
+/**
+ * Attach to a remotely running process and launch the necessary gdbserver via TCF/TE.
+ */
+public class TEGdbAttachLaunchDelegate extends GdbAttachLaunchDelegate {
+
+}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/tabs/TECDSFMainAttachTab.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/tabs/TECDSFMainAttachTab.java
new file mode 100644
index 000000000..698e79138
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/tabs/TECDSFMainAttachTab.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.tcf.launch.cdt.tabs;
+
+import org.eclipse.cdt.dsf.gdb.internal.ui.launching.CMainAttachTab;
+
+/**
+ * Main attach tab implementation.
+ */
+@SuppressWarnings("restriction")
+public class TECDSFMainAttachTab extends CMainAttachTab {
+
+
+}