# HG changeset patch
# User dadubrow
# Date 1278434561 18000
# Node ID 8ced3afefe5bcf6d3a00469513017ae99a5f465f
# Parent  660c89efde83a36257e67ef36d5ae6e8b59ae8bf
Bug 11444 and bug 11599 - for non x86, allow non-exe executables and for attach don't ask for install file

diff -r 660c89efde83 -r 8ced3afefe5b 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:58:26 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java	Tue Jul 06 11:42:41 2010 -0500
@@ -222,20 +222,19 @@
 	}
 	
 	private boolean getExePathsFromProjectAndDetermineIfX86(IProject project, List<IPath> 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 660c89efde83 -r 8ced3afefe5b 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:58:26 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/DebugRunProcessSection.java	Tue Jul 06 11:42:41 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());