From: Jaewon Lim Date: Fri, 13 Jul 2012 10:20:25 +0000 (+0900) Subject: [Title] profile as context menu bug fix X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=342f791b12899cea9719e77f852cac3de72251e5;p=sdk%2Fide%2Fprofiler-eplugin.git [Title] profile as context menu bug fix [Type] bug fix [Module] profiler-eplugin [Priority] major [Jira#] S1-5611 [Redmine#] [Problem] "profile as" context menu cause error "binary not found" [Cause] bada app binary is not executable but shared lib [Solution] find binary not only executable but also shared library [TestCase] --- diff --git a/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF index 2d6bd91..dc64a7e 100644 --- a/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF @@ -11,6 +11,7 @@ Import-Package: org.eclipse.cdt.core.model, org.eclipse.cdt.debug.core, org.eclipse.cdt.launch, org.eclipse.cdt.launch.ui, + org.eclipse.cdt.managedbuilder.core, org.eclipse.cdt.ui, org.eclipse.core.resources, org.eclipse.debug.core, diff --git a/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchShortcut.java b/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchShortcut.java index b4bd9f4..7aac480 100644 --- a/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchShortcut.java +++ b/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchShortcut.java @@ -23,6 +23,8 @@ import org.eclipse.cdt.core.model.IBinary; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants; import org.eclipse.cdt.launch.AbstractCLaunchDelegate; +import org.eclipse.cdt.managedbuilder.core.IConfiguration; +import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; import org.eclipse.cdt.ui.CElementLabelProvider; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; @@ -206,10 +208,14 @@ public static void showErrorDialog(final String errorMessage, final String reaso if (cproject != null) { try { IBinary[] bins = cproject.getBinaryContainer().getBinaries(); + IConfiguration config = ManagedBuildManager.getBuildInfo(r.getProject()).getDefaultConfiguration(); + String activeBuildConfiguration = config.toString(); for (int j = 0; j < bins.length; j++) { - if (bins[j].isExecutable()) { - results.add(bins[j]); + if (bins[j].isExecutable() || bins[j].isSharedLib()) { + String parentDirName = bins[j].getPath().removeLastSegments(1).lastSegment(); + if (parentDirName.equals(activeBuildConfiguration)) + results.add(bins[j]); } } } catch (CModelException e) { diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 6480ba4..520a220 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,5 +1,5 @@ Package:profiler-eplugin -Version:0.2.5 +Version:0.2.6 OS:linux Build-host-os:linux Maintainer:Jaewon Lim , Juyoung Kim @@ -9,7 +9,7 @@ Install-dependency:base-ide-product [linux], common-eplugin [linux], nativecommo Build-dependency:indigo-pde [linux], common-eplugin [linux], nativecpp-eplugin [linux], nativecommon-eplugin [linux] Package:profiler-eplugin -Version:0.2.5 +Version:0.2.6 OS:windows Build-host-os:linux Maintainer:Jaewon Lim , Juyoung Kim