Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt')
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/plugin.xml14
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbAbstractLaunchDelegate.java5
2 files changed, 11 insertions, 8 deletions
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 97eb54bfe..a50feed5e 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
@@ -106,20 +106,20 @@ Anna Dushistova (MontaVista) - adapted from org.eclipse.cdt.launch.remote
<placement after="org.eclipse.tcf.te.remotecdt.debug.debuggerTab"/>
</tab>
<tab
- id="org.eclipse.tcf.te.remotecdt.debug.commonTab"
+ id="org.eclipse.tcf.te.remotecdt.debug.environmentTab"
group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
- name="Common"
- class="org.eclipse.debug.ui.CommonTab">
+ name="Environment"
+ class="org.eclipse.tcf.te.tcf.launch.cdt.tabs.TEEnvironmentTab">
<associatedDelegate delegate="org.eclipse.tcf.te.remotecdt.debug"/>
<placement after="org.eclipse.debug.ui.sourceLookupTab"/>
</tab>
<tab
- id="org.eclipse.tcf.te.remotecdt.debug.environmentTab"
+ id="org.eclipse.tcf.te.remotecdt.debug.commonTab"
group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
- name="Environment"
- class="org.eclipse.tcf.te.tcf.launch.cdt.tabs.TEEnvironmentTab">
+ name="Common"
+ class="org.eclipse.debug.ui.CommonTab">
<associatedDelegate delegate="org.eclipse.tcf.te.remotecdt.debug"/>
- <placement after="org.eclipse.debug.ui.sourceLookupTab"/>
+ <placement after="org.eclipse.debug.ui.environmentTab"/>
</tab>
<!-- Attach Launch -->
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbAbstractLaunchDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbAbstractLaunchDelegate.java
index 8e1a89fbe..0cdc4f562 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbAbstractLaunchDelegate.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbAbstractLaunchDelegate.java
@@ -69,6 +69,8 @@ import org.eclipse.tcf.te.tcf.processes.core.launcher.ProcessLauncher;
@SuppressWarnings("restriction")
public abstract class TEGdbAbstractLaunchDelegate extends GdbLaunchDelegate {
+ private String fCurrentGdbServerPort;
+
/**
* Constructor
*/
@@ -168,6 +170,7 @@ public abstract class TEGdbAbstractLaunchDelegate extends GdbLaunchDelegate {
final AtomicInteger indexAlternatives = new AtomicInteger(0);
do {
+ fCurrentGdbServerPort = gdbserverPortNumber.get();
gdbserverLaunchRetry.set(false);
final AtomicBoolean gdbServerStarted = new AtomicBoolean(false);
@@ -465,7 +468,7 @@ public abstract class TEGdbAbstractLaunchDelegate extends GdbLaunchDelegate {
if (d.contains("Address already in use.")) { //$NON-NLS-1$
// Get host and port
String host = lc.getAttribute(IGDBLaunchConfigurationConstants.ATTR_HOST, (String)null);
- String port = lc.getAttribute(IGDBLaunchConfigurationConstants.ATTR_PORT, (String)null);
+ String port = fCurrentGdbServerPort;
String address = host + (port != null ? ":" + port : ""); //$NON-NLS-1$ //$NON-NLS-2$
d = NLS.bind(Messages.TEGdbAbstractLaunchDelegate_error_addressInUse, address);

Back to the top