From 97bd508eb13cfd7d74e857f97e201d92d3e30be3 Mon Sep 17 00:00:00 2001 From: David Inglis Date: Mon, 4 Nov 2002 20:05:14 +0000 Subject: [PATCH] support "*" as platform and change local to native --- launch/org.eclipse.cdt.launch/ChangeLog | 5 +++++ .../src/org/eclipse/cdt/launch/ui/CDebuggerTab.java | 4 ++-- .../src/org/eclipse/cdt/launch/ui/CMainTab.java | 6 ++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/launch/org.eclipse.cdt.launch/ChangeLog b/launch/org.eclipse.cdt.launch/ChangeLog index 93958b3e87e..d576afb2900 100644 --- a/launch/org.eclipse.cdt.launch/ChangeLog +++ b/launch/org.eclipse.cdt.launch/ChangeLog @@ -1,3 +1,8 @@ +2002-11-04 David Inglis + * src/.../launch/ui/CDebuggerTab.java + * src/.../launch/ui/CMainTab.java + change "local" to "native" and support "*" as a wildcard for platform. + 2002-11-04 David Inglis * src/.../launch/internal/ui/LocalCLaunchCOnfigurationTabGroup.java don't filter tab list based on mode since the configuration is shared with debug mode. diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java index ffe429bb539..9ff8f288da0 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java @@ -106,9 +106,9 @@ public class CDebuggerTab extends AbstractCDebuggerTab { if (debugConfigs[i].supportsMode(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN) || debugConfigs[i].supportsMode(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH) ) { String supported[] = debugConfigs[i].getPlatforms(); - boolean isLocal = platform.equals(BootLoader.getOS()); + boolean isNative = platform.equals(BootLoader.getOS()); for (int j = 0; j < supported.length; j++) { - if (supported[j].equalsIgnoreCase(platform) || (isLocal && supported[j].equalsIgnoreCase("local"))) { + if (supported[j].equalsIgnoreCase(platform) || (isNative && supported[j].equalsIgnoreCase("native"))) { fDCombo.add(debugConfigs[i].getName()); fDCombo.setData(Integer.toString(x), debugConfigs[i]); if (selection.equals(debugConfigs[i].getID())) { diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java index 778dedc4a22..ea509a4957e 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java @@ -266,13 +266,15 @@ public class CMainTab extends CLaunchConfigurationTab { protected ICProject[] getCProjects() { ICProject cproject[] = CoreModel.getDefault().getCRoot().getCProjects(); ArrayList list = new ArrayList(cproject.length); - boolean isLocal = filterPlatform.equals(BootLoader.getOS()); + boolean isNative = filterPlatform.equals(BootLoader.getOS()); for (int i = 0; i < cproject.length; i++) { ICDescriptor cdesciptor = null; try { cdesciptor = CCorePlugin.getDefault().getCProjectDescription((IProject) cproject[i].getResource()); - if (filterPlatform.equals("*") || (isLocal && cdesciptor.getPlatform().equalsIgnoreCase("local")) + String projectPlatform = cdesciptor.getPlatform(); + if (filterPlatform.equals("*") || projectPlatform.equals("*") || + (isNative && cdesciptor.getPlatform().equalsIgnoreCase("native")) || filterPlatform.equalsIgnoreCase(cdesciptor.getPlatform()) == true) { list.add(cproject[i]); }