aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamilo Bernal2012-12-11 16:52:57 (EST)
committerJeff Johnston2012-12-14 17:15:34 (EST)
commite3a7610438e56c30323c76de826b801709c996a3 (patch)
tree1201c7b74bd5e148ef1e39bd5466f77a7d399961
parent4aa78cdfefebdfc4a6c17df1fb76c7421a914dd1 (diff)
downloadorg.eclipse.linuxtools-e3a7610438e56c30323c76de826b801709c996a3.zip
org.eclipse.linuxtools-e3a7610438e56c30323c76de826b801709c996a3.tar.gz
org.eclipse.linuxtools-e3a7610438e56c30323c76de826b801709c996a3.tar.bz2
Bug 395401: Place Linux Tools short-cuts into special context menu item.refs/changes/03/9203/6
Linux Tools short-cuts moved to "Profiling Tools" context menu. Also, updated gcov launch tests to reflect these changes. Change-Id: Ibf258c650d7393e3b8984078ac27dff302367682 Reviewed-on: https://git.eclipse.org/r/9203 Tested-by: Hudson CI Reviewed-by: Jeff Johnston <jjohnstn@redhat.com> IP-Clean: Jeff Johnston <jjohnstn@redhat.com> Tested-by: Jeff Johnston <jjohnstn@redhat.com>
-rw-r--r--gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTest.java2
-rw-r--r--oprofile/org.eclipse.linuxtools.oprofile.launch/plugin.xml8
-rw-r--r--oprofile/org.eclipse.linuxtools.oprofile.remote.launch/plugin.xml2
-rw-r--r--perf/org.eclipse.linuxtools.perf/plugin.xml6
-rw-r--r--profiling/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF5
-rw-r--r--profiling/org.eclipse.linuxtools.profiling.launch/icons/profile_wiz.pngbin0 -> 8548 bytes
-rw-r--r--profiling/org.eclipse.linuxtools.profiling.launch/plugin.xml49
-rw-r--r--profiling/org.eclipse.linuxtools.profiling.launch/pom.xml2
-rw-r--r--profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/ProfileContextualLaunchAction.java20
-rw-r--r--profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/ProfileLaunchPlugin.java3
-rw-r--r--systemtap/org.eclipse.linuxtools.callgraph.launch/plugin.xml4
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/plugin.xml4
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch/plugin.xml4
13 files changed, 84 insertions, 25 deletions
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTest.java b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTest.java
index bae3532..e234e76 100644
--- a/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTest.java
+++ b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTest.java
@@ -203,7 +203,7 @@ public abstract class GcovTest {
}
}
treeBot.expandNode(projectName).select(binNodeName);
- String menuItem = "Profile As";
+ String menuItem = "Profiling Tools";
String subMenuItem = "1 Profile Code Coverage";
ContextMenuHelper.clickContextMenu(treeBot, menuItem, subMenuItem);
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/plugin.xml b/oprofile/org.eclipse.linuxtools.oprofile.launch/plugin.xml
index bca8dbe..df48bfe 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/plugin.xml
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/plugin.xml
@@ -6,7 +6,7 @@
<launchConfigurationType
delegate="org.eclipse.linuxtools.internal.oprofile.launch.launching.OprofileLaunchConfigurationDelegate"
id="org.eclipse.linuxtools.oprofile.launch.oprofile"
- modes="profile"
+ modes="linuxtools"
name="%launchconfigurationtype.label"
public="true"
sourceLocatorId="org.eclipse.cdt.launch.DefaultSourceLocator"
@@ -15,7 +15,7 @@
<launchConfigurationType
delegate="org.eclipse.linuxtools.internal.oprofile.launch.launching.OprofileManualLaunchConfigurationDelegate"
id="org.eclipse.linuxtools.oprofile.launch.oprofile.manual"
- modes="profile"
+ modes="linuxtools"
name="%launchconfigurationtype.manual.label"
public="true"
sourceLocatorId="org.eclipse.cdt.launch.DefaultSourceLocator"
@@ -55,7 +55,7 @@
icon="icons/profile_run.png"
id="org.eclipse.linuxtools.oprofile.launch.profileshortcut"
label="%launchshortcuts.label"
- modes="profile">
+ modes="linuxtools">
<contextualLaunch>
<enablement>
<!-- FIXME: this is not a proper enablement condition -->
@@ -86,7 +86,7 @@
icon="icons/profile_manual_run.png"
id="org.eclipse.linuxtools.oprofile.launch.profileshortcut.manual"
label="%manual.launchshortcuts.label"
- modes="profile">
+ modes="linuxtools">
<contextualLaunch>
<enablement>
<with
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/plugin.xml b/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/plugin.xml
index 575f5a1..2466474 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/plugin.xml
+++ b/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/plugin.xml
@@ -6,7 +6,7 @@
<launchConfigurationType
delegate="org.eclipse.linuxtools.internal.oprofile.remote.launch.launching.OprofileRemoteLaunchConfigurationDelegate"
id="org.eclipse.linuxtools.oprofile.launch.oprofile.remote"
- modes="profile"
+ modes="linuxtools"
name="%launchconfigurationtype.remote.label"
public="true"
sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
diff --git a/perf/org.eclipse.linuxtools.perf/plugin.xml b/perf/org.eclipse.linuxtools.perf/plugin.xml
index 2b575d7..81cf98a 100644
--- a/perf/org.eclipse.linuxtools.perf/plugin.xml
+++ b/perf/org.eclipse.linuxtools.perf/plugin.xml
@@ -33,7 +33,7 @@
icon="icons/symbol.gif"
id="org.eclipse.linuxtools.perf.launch.profileshortcut"
label="Profile with Perf"
- modes="profile">
+ modes="linuxtools">
<contextualLaunch>
<enablement>
<with
@@ -78,7 +78,7 @@
<launchConfigurationType
delegate="org.eclipse.linuxtools.internal.perf.launch.PerfLaunchConfigDelegate"
id="org.eclipse.linuxtools.perf.launch.profile"
- modes="profile"
+ modes="linuxtools"
name="Profile with Perf"
public="true"
sourceLocatorId="org.eclipse.cdt.launch.DefaultSourceLocator"
@@ -87,7 +87,7 @@
<launchConfigurationType
delegate="org.eclipse.linuxtools.internal.perf.remote.launch.PerfLaunchConfigDelegate"
id="org.eclipse.linuxtools.perf.remote.launch.profile"
- modes="profile"
+ modes="linuxtools"
name="Profile with Remote Perf"
public="true"
sourceLocatorId="org.eclipse.cdt.launch.DefaultSourceLocator"
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF
index b20e2e8..6f9e578 100644
--- a/profiling/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.linuxtools.profiling.launch;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.eclipse.linuxtools.internal.profiling.launch.ProfileLaunchPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
@@ -23,11 +23,12 @@ Import-Package: org.eclipse.cdt.core.model,
org.eclipse.debug.core,
org.eclipse.debug.core.model,
org.eclipse.debug.ui,
+ org.eclipse.debug.ui.actions,
org.eclipse.debug.ui.sourcelookup,
org.eclipse.jface.text,
org.eclipse.ui,
org.eclipse.ui.console
-Export-Package: org.eclipse.linuxtools.internal.profiling.launch,
+Export-Package: org.eclipse.linuxtools.internal.profiling.launch;x-internal:=true,
org.eclipse.linuxtools.internal.profiling.launch.provider;x-friends:="org.eclipse.linuxtools.gprof.test",
org.eclipse.linuxtools.internal.profiling.launch.provider.launch;x-friends:="org.eclipse.linuxtools.gprof.test",
org.eclipse.linuxtools.profiling.launch,
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/icons/profile_wiz.png b/profiling/org.eclipse.linuxtools.profiling.launch/icons/profile_wiz.png
new file mode 100644
index 0000000..7229ca0
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/icons/profile_wiz.png
Binary files differ
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/plugin.xml b/profiling/org.eclipse.linuxtools.profiling.launch/plugin.xml
index f813a3d..a52b7ac 100644
--- a/profiling/org.eclipse.linuxtools.profiling.launch/plugin.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/plugin.xml
@@ -22,7 +22,7 @@
icon="icons/time_obj.gif"
id="org.eclipse.linuxtools.profiling.provider.TimingLaunchShortcut"
label="%shortcut.label"
- modes="profile"
+ modes="linuxtools"
path="/linuxtools/category">
<class class="org.eclipse.linuxtools.internal.profiling.launch.provider.launch.ProviderLaunchShortcut">
<parameter
@@ -91,7 +91,7 @@
<launchConfigurationType
delegate="org.eclipse.linuxtools.internal.profiling.launch.provider.launch.ProviderLaunchConfigurationDelegate"
id="org.eclipse.linuxtools.profiling.provider.TimingLaunchConfigurationType"
- modes="profile"
+ modes="linuxtools"
name="%launchConfigurationType.name"
public="true"
sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
@@ -119,7 +119,7 @@
icon="icons/memory_view.gif"
id="org.eclipse.linuxtools.profiling.provider.MemoryLaunchShortcut"
label="%shortcut.label.0"
- modes="profile"
+ modes="linuxtools"
path="/linuxtools/category">
<class class="org.eclipse.linuxtools.internal.profiling.launch.provider.launch.ProviderLaunchShortcut">
<parameter
@@ -188,7 +188,7 @@
<launchConfigurationType
delegate="org.eclipse.linuxtools.internal.profiling.launch.provider.launch.ProviderLaunchConfigurationDelegate"
id="org.eclipse.linuxtools.profiling.provider.MemoryLaunchConfigurationType"
- modes="profile"
+ modes="linuxtools"
name="%launchConfigurationType.name.0"
public="true"
sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
@@ -216,7 +216,7 @@
icon="icons/toggle.gif"
id="org.eclipse.linuxtools.profiling.provider.CoverageLaunchShortcut"
label="%shortcut.label.1"
- modes="profile"
+ modes="linuxtools"
path="/linuxtools/category">
<class class="org.eclipse.linuxtools.internal.profiling.launch.provider.launch.ProviderLaunchShortcut">
<parameter
@@ -285,7 +285,7 @@
<launchConfigurationType
delegate="org.eclipse.linuxtools.internal.profiling.launch.provider.launch.ProviderLaunchConfigurationDelegate"
id="org.eclipse.linuxtools.profiling.provider.CoverageLaunchConfigurationType"
- modes="profile"
+ modes="linuxtools"
name="%launchConfigurationType.name.1"
public="true"
sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
@@ -376,5 +376,40 @@
scheme="local"
schemeLabel="Local">
</resourceSelectorProxy>
- </extension>
+ </extension>
+ <extension
+ point="org.eclipse.ui.popupMenus">
+ <objectContribution
+ adaptable="true"
+ id="org.eclipse.linuxtools.profiling.launch.menu"
+ objectClass="org.eclipse.core.resources.IResource">
+ <action
+ class="org.eclipse.linuxtools.internal.profiling.launch.ProfileContextualLaunchAction"
+ enablesFor="+"
+ id="org.eclipse.linuxtools.profiling.launch.submenu"
+ label="Profiling Tools"
+ menubarPath="additions"
+ style="pulldown">
+ </action>
+ </objectContribution>
+ </extension>
+ <extension
+ point="org.eclipse.debug.ui.launchGroups">
+ <launchGroup
+ bannerImage="icons/profile_wiz.png"
+ id="org.eclipse.debug.ui.launchGroup.profilee"
+ image="icons/time_obj.gif"
+ label="Profiling Tools"
+ mode="linuxtools"
+ title="Profiling Tools">
+ </launchGroup>
+ </extension>
+ <extension
+ point="org.eclipse.debug.core.launchModes">
+ <launchMode
+ label="Profile"
+ launchAsLabel="Linux Profiling Tools"
+ mode="linuxtools">
+ </launchMode>
+ </extension>
</plugin>
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml b/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml
index 71b095c..d2c9dbf 100644
--- a/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml
@@ -18,7 +18,7 @@
</parent>
<artifactId>org.eclipse.linuxtools.profiling.launch</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<name>Linux Tools Profiling Launch Plug-in</name>
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/ProfileContextualLaunchAction.java b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/ProfileContextualLaunchAction.java
new file mode 100644
index 0000000..b443f49
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/ProfileContextualLaunchAction.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.profiling.launch;
+
+import org.eclipse.debug.ui.actions.ContextualLaunchAction;
+
+public class ProfileContextualLaunchAction extends ContextualLaunchAction {
+
+ public ProfileContextualLaunchAction() {
+ super(ProfileLaunchPlugin.LAUNCH_MODE);
+ }
+}
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/ProfileLaunchPlugin.java b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/ProfileLaunchPlugin.java
index e7ec6e8..62b82e7 100644
--- a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/ProfileLaunchPlugin.java
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/ProfileLaunchPlugin.java
@@ -24,6 +24,9 @@ public class ProfileLaunchPlugin extends AbstractUIPlugin {
// The shared instance
private static ProfileLaunchPlugin plugin;
+ // The launch mode this plug-in supports
+ public static final String LAUNCH_MODE = "linuxtools"; //$NON-NLS-1$
+
/**
* The constructor
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/plugin.xml b/systemtap/org.eclipse.linuxtools.callgraph.launch/plugin.xml
index 75a1e58..b9f12a6 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/plugin.xml
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/plugin.xml
@@ -14,7 +14,7 @@
<launchConfigurationType
delegate="org.eclipse.linuxtools.internal.callgraph.launch.SystemTapLaunchConfigurationDelegate"
id="org.eclipse.linuxtools.callgraph.launch.systemtapLaunch"
- modes="profile"
+ modes="linuxtools"
name="%launchConfigurationType.name.0"
public="true"
sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
@@ -42,7 +42,7 @@
id="org.eclipse.linuxtools.systemtap.quicklaunchStapGraph1"
icon="icons/bar_graph.png"
label="%launch.name"
- modes="profile">
+ modes="linuxtools">
<contextualLaunch>
<enablement>
<with
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/plugin.xml b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/plugin.xml
index 3b652c2..fe2b31a 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/plugin.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/plugin.xml
@@ -6,7 +6,7 @@
<launchConfigurationType
delegate="org.eclipse.linuxtools.internal.valgrind.launch.ValgrindRemoteProxyLaunchDelegate"
id="org.eclipse.linuxtools.valgrind.launch.remote.launchConfigurationType"
- modes="profile"
+ modes="linuxtools"
name="%launchConfigurationType.name"
public="true"
sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
@@ -37,7 +37,7 @@
icon="icons/valgrind-icon.png"
id="org.eclipse.linuxtools.valgrind.launch.remote.shortcut"
label="%shortcut.label"
- modes="profile">
+ modes="linuxtools">
</shortcut>
</extension>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/plugin.xml b/valgrind/org.eclipse.linuxtools.valgrind.launch/plugin.xml
index 9424352..b235d54 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/plugin.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/plugin.xml
@@ -8,7 +8,7 @@
<launchConfigurationType
delegate="org.eclipse.linuxtools.internal.valgrind.launch.ValgrindLaunchConfigurationDelegate"
id="org.eclipse.linuxtools.valgrind.launch.valgrindLaunch"
- modes="profile"
+ modes="linuxtools"
name="%launchConfigurationType.name.0"
public="true"
sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
@@ -39,7 +39,7 @@
icon="icons/valgrind-icon.png"
id="org.eclipse.linuxtools.valgrind.launch.shortcut1"
label="%shortcut.label.0"
- modes="profile">
+ modes="linuxtools">
<contextualLaunch>
<enablement>
<with