# HG changeset patch # User dadubrow # Date 1278434806 18000 # Node ID ceccb3d7ade9a0e478e85d1bc47e1727c7c59a26 # Parent c643300d6509abb8c2579ff60a5eb4762cb06f57 Bug 11444 and bug 11599 - for non x86, allow non-exe executables and for attach don't ask for install file diff -r c643300d6509 -r ceccb3d7ade9 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java Fri Jul 02 16:59:04 2010 -0500 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java Tue Jul 06 11:46:46 2010 -0500 @@ -222,20 +222,19 @@ } private boolean getExePathsFromProjectAndDetermineIfX86(IProject project, List exePaths) { + // changed logic to allow paths for executables for !isExecutable(path) for non-x86 + // this allows new plug-and-play wizard to create attach configs for imported dlls (see bug 11444) boolean isX86 = false; ICProject cProject = CoreModel.getDefault().create(project); if (cProject != null) { try { for (IBinary bin : cProject.getBinaryContainer().getBinaries()) { - if (bin.isExecutable()) { - IPath path = bin.getResource().getLocation(); - - if (isEmulatorBinaryPath(path)) { - isX86 = true; - } + IPath path = bin.getResource().getLocation(); + + isX86 = isX86 || isEmulatorBinaryPath(path); // only check once + if (!isX86 || bin.isExecutable()) exePaths.add(path); - } } } catch (CModelException e) { log(e); diff -r c643300d6509 -r ceccb3d7ade9 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/DebugRunProcessSection.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/DebugRunProcessSection.java Fri Jul 02 16:59:04 2010 -0500 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/DebugRunProcessSection.java Tue Jul 06 11:46:46 2010 -0500 @@ -76,7 +76,7 @@ } if (data.getExeSelection().equals(EExeSelection.ATTACH_TO_PROCESS)) { - data.setInstallPackage(true); + data.setInstallPackage(false); } else { Boolean detectedSysTrk = data.isSysTRKConnection(); // TRUE, FALSE, or null boolean isSysTrk = detectedSysTrk == Boolean.TRUE || (detectedSysTrk == null && data.isInternalLayout());