Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Grunberg2013-04-19 15:18:04 -0400
committerJeff Johnston2013-04-23 17:03:12 -0400
commitc5322b3803694f2299e276609f7794701c4e753f (patch)
treefb048bf8bc30fc105b39a9331cbeff92cb08be04
parentf7670ecc9817dca70115f00d413842edc1a3ef24 (diff)
downloadorg.eclipse.linuxtools-c5322b3803694f2299e276609f7794701c4e753f.tar.gz
org.eclipse.linuxtools-c5322b3803694f2299e276609f7794701c4e753f.tar.xz
org.eclipse.linuxtools-c5322b3803694f2299e276609f7794701c4e753f.zip
Remove Valgrind remote functionality that used RSE.
Valgrind has been using the Remote Proxy solution for some time so the functionality that had a strict dependence on RSE can be removed. This involves the removal of o.e.linuxtools.valgrind.launch.remote. Change-Id: I6a5dec96b86fd332126ebff882ce37bc14706b22 Reviewed-on: https://git.eclipse.org/r/12080 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--valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml2
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind-feature/pom.xml2
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/.classpath7
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/.gitignore5
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/.project34
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/ChangeLog146
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/META-INF/MANIFEST.MF24
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/OSGI-INF/l10n/bundle.properties6
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/about.html28
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/build.properties9
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/icons/valgrind-icon.pngbin713 -> 0 bytes
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/plugin.xml44
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/pom.xml44
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/Messages.java44
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchConstants.java25
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchDelegate.java209
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchShortcut.java17
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchTabGroup.java25
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemotePlugin.java62
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteTab.java157
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/messages.properties20
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch/META-INF/MANIFEST.MF2
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch/plugin.properties2
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch/plugin.xml20
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch/pom.xml2
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.remote-feature/feature.xml23
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.remote-feature/pom.xml2
-rw-r--r--valgrind/pom.xml1
29 files changed, 28 insertions, 942 deletions
diff --git a/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml b/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml
index 40cb4af3b2..4c5ea392af 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.valgrind"
label="%featureName"
- version="1.1.0.qualifier"
+ version="2.0.0.qualifier"
provider-name="%featureProvider"
os="linux,macosx">
diff --git a/valgrind/org.eclipse.linuxtools.valgrind-feature/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind-feature/pom.xml
index 0ee02f12d7..dbbf279185 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind-feature/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind-feature/pom.xml
@@ -18,7 +18,7 @@
</parent>
<artifactId>org.eclipse.linuxtools.valgrind</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<name>Linux Tools Valgrind Tools Integration Feature</name>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/.classpath b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/.gitignore b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/.gitignore
deleted file mode 100644
index 8d94ef8deb..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-@dot
-javaCompiler...args
-build.xml
-target
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/.project b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/.project
deleted file mode 100644
index 6df466695f..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.linuxtools.valgrind.launch.remote</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/.settings/org.eclipse.jdt.core.prefs b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 17ba2d5b7e..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Thu Jun 03 23:10:42 EDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/ChangeLog
deleted file mode 100644
index c608fadf02..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/ChangeLog
+++ /dev/null
@@ -1,146 +0,0 @@
-2011-08-15 Jeff Johnston <jjohnstn@redhat.com>
-
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/messages.properties: Change error
- message concerning TCF.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchDelegate.java (launch):
- Change to new remote command API and check return code to see if an error
- dialog is warranted.
-
-2011-08-08 Jeff Johnston <jjohnstn@redhat.com>
-
- * META-INF/MANIFEST.MF: Remove TCF references.
-
-2011-07-06 Jeff Johnston <jjohnstn@redhat.com>
-
- * META-INF/MANIFEST.MF: Fix profiling remote launch dependency.
-
-2011-06-29 Jeff Johnston <jjohnstn@redhat.com>
-
- * icons/tcf.gif: Removed.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteUtils.java: Ditto.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteLaunchConstants.java: Ditto.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteCommand.java: Ditto.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteMessages.java: Ditto.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/remoteMessages.properties: Ditto.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/IRemoteCaller.java: Ditto.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteProcess.java: Ditto.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteInputStream.java: Ditto.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteOutputStream.java: Ditto.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchDelegate.java (launch): Rewritten
- to use RemoteConnection for underlying remote tasks.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchTabGroup.java: Change imports to
- new structure in Linux Tools profiling remote launch plugin.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteTab.java(getImage): Removed.
- * META-INF/MANIFEST.MF: Add dependency on org.eclipse.linuxtools.profiling.remote.launch.
-
-2011-06-17 Jeff Johnston <jjohnstn@redhat.com>
-
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/IRemoteCaller.java: New file.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteCommand.java (..doneStart):
- When process gets created, notifiy IRemoteProcessListener.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteCommand.java (startProcess):
- Pass this to RemoteCommand so process can be recorded when created.
- (newProcess): New method.
-
-2011-06-16 Jeff Johnston <jjohnstn@redhat.com>
-
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindTCFInputStream: Removed.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindTCFOutputStream: Ditto.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteProcess: Removed.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteLaunchPlugin: Removed.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteTab.java: New file.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteUtils.java: Ditto.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchConstants.java: Ditto.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteCommand.java: Ditto.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteMessages.java: Ditto.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/remoteMessages.properties: Ditto.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/IRemoteCaller.java: Ditto.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteProcess.java: Ditto.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteInputStream.java: Renamed from
- ValgrindTCFInputStream.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteOutputStream.java: Renamed from
- ValgrindTCFOutputStream.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteProcess.java: Renamed from
- ValgrindRemoteProcess.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemotePlugin.java: Renamed from
- RemoteLaunchPlugin.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteCommand.java: Split common
- functionality to RemoteCommand.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteTab.java: Split common
- functionality to RemoteTab.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteLaunchConstants.java: Split
- Valgrind functionality to ValgrindRemoteLaunchConstants.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchDelegate.java: Renamed from
-
-2011-04-21 Jeff Johnston <jjohnstn@redhat.com>
-
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchDelegate.java: Add a check to prevent infinite
- loop from occurring if a bug occurs trying to start the process.
-
-2010-08-11 Elliott Baron <ebaron@fedoraproject.org>
-
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindTCFInputStream.java (read1): Used Java 6 constructor for IOException.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindTCFOutputStream.java (.doneWrite): Actually save error.
- (write1): Used Java 6 constructor for IOException.
- * META-INF/MANIFEST.MF: Removed unnecessary dependency.
-
-2010-08-06 Elliott Baron <ebaron@fedoraproject.org>
-
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteLaunchStep.java (RemoteLaunchStep): Store name.
- (toString): Use launch step name.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchDelegate.java (launch): Reset process to null, since delegate
- can be reused by caller.
- (disconnect): Actually disconnect if channel is not closed.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchTabGroup.java (getProfileTabs): Arguments
- Working Directory problem has been fixed in superclass.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteTab.java (refreshPeerViewer): Ensure content provider is set.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindTCFInputStream.java (.doneRead): Added FIXME: Problems with losing data.
-
-2010-08-03 Elliott Baron <ebaron@fedoraproject.org>
-
- * icons/tcf.gif: New file.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteTab.java: New file.
- * META-INF/MANIFEST.MF: New dep.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/Messages.java: New keys.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/messages.properties: Likewise.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteLaunchConstants.java: New constants.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteLaunchStep.java: Added debugging code.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteCommand.java: Disconnect stdin on exit.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchDelegate.java: Refactoring, improvements
- to cleanup.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchTabGroup.java (getProfileTabs): Don't check version.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteProcess.java: Removed launch steps.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindTCFInputStream.java: Don't use launch step,
- disconnect stream on EOS.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindTCFOutputStream.java: Don't use launch step.
-
-2010-08-01 Elliott Baron <ebaron@fedoraproject.org>
-
- * .project: Remove "internal" from project name.
-
-2010-07-26 Elliott Baron <ebaron@fedoraproject.org>
-
- * .classpath: New file.
- * .project: New file.
- * .settings/org.eclipse.jdt.core.prefs: New file.
- * about.html: New file.
- * build.properties: New file.
- * icons/valgrind-icon.png: New file.
- * OSGI-INF/l10n/bundle.properties: New file.
- * plugin.xml: New file.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/Messages.java: New file.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/messages.properties: New file.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteLaunchConstants.java: New file.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteLaunchPlugin.java: New file.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteLaunchStep.java: New file.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteCommand.java: New file.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchDelegate.java: New file.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchShortcut.java: New file.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchTabGroup.java: New file.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteProcess.java: New file.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindTCFInputStream.java: New file.
- * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindTCFOutputStream.java: New file.
- * src/org/eclipse/linuxtools/valgrind/launch/remote: New file.
- * META-INF/MANIFEST.MF: New file.
-
- \ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/META-INF/MANIFEST.MF
deleted file mode 100644
index 97f2b4f7d6..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.launch.remote;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.linuxtools.internal.valgrind.launch.remote.ValgrindRemotePlugin
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.linuxtools.profiling.launch.remote;bundle-version="0.8.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.linuxtools.internal.valgrind.launch.remote
-Import-Package: org.eclipse.cdt.core.model,
- org.eclipse.cdt.debug.core,
- org.eclipse.cdt.launch,
- org.eclipse.debug.core,
- org.eclipse.debug.ui,
- org.eclipse.linuxtools.internal.valgrind.launch,
- org.eclipse.linuxtools.internal.valgrind.ui,
- org.eclipse.linuxtools.profiling.launch,
- org.eclipse.linuxtools.profiling.launch.remote,
- org.eclipse.linuxtools.valgrind.core,
- org.eclipse.linuxtools.valgrind.launch
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/OSGI-INF/l10n/bundle.properties b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index f2bc151a59..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Properties file for org.eclipse.linuxtools.valgrind.launch.remote
-launchConfigurationType.name = Profile With Valgrind (Remote)
-launchConfigurationTabGroup.description = Profile Remote C/C++ Application Using Valgrind
-shortcut.label = Profile With Valgrind (Remote)
-Bundle-Vendor = Eclipse Linux Tools
-Bundle-Name = Valgrind Remote Launch Plug-in
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/about.html b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/about.html
deleted file mode 100644
index c258ef55d8..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2006</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/build.properties b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/build.properties
deleted file mode 100644
index 6247138ddc..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- icons/,\
- OSGI-INF/l10n/bundle.properties,\
- about.html,\
- OSGI-INF/
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/icons/valgrind-icon.png b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/icons/valgrind-icon.png
deleted file mode 100644
index 099bbda554..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/icons/valgrind-icon.png
+++ /dev/null
Binary files differ
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/plugin.xml b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/plugin.xml
deleted file mode 100644
index fe2b31ac19..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/plugin.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.debug.core.launchConfigurationTypes">
- <launchConfigurationType
- delegate="org.eclipse.linuxtools.internal.valgrind.launch.ValgrindRemoteProxyLaunchDelegate"
- id="org.eclipse.linuxtools.valgrind.launch.remote.launchConfigurationType"
- modes="linuxtools"
- name="%launchConfigurationType.name"
- public="true"
- sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
- sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
- </launchConfigurationType>
- </extension>
- <extension
- point="org.eclipse.debug.ui.launchConfigurationTabGroups">
- <launchConfigurationTabGroup
- class="org.eclipse.linuxtools.internal.valgrind.launch.ValgrindRemoteProxyLaunchConfigurationTabGroup"
- description="%launchConfigurationTabGroup.description"
- id="org.eclipse.linuxtools.valgrind.launch.remote.tabGroup"
- type="org.eclipse.linuxtools.valgrind.launch.remote.launchConfigurationType">
- </launchConfigurationTabGroup>
- </extension>
- <extension
- point="org.eclipse.debug.ui.launchConfigurationTypeImages">
- <launchConfigurationTypeImage
- configTypeID="org.eclipse.linuxtools.valgrind.launch.remote.launchConfigurationType"
- icon="icons/valgrind-icon.png"
- id="org.eclipse.linuxtools.valgrind.launch.remote.launchConfigurationTypeImage1">
- </launchConfigurationTypeImage>
- </extension>
- <extension
- point="org.eclipse.debug.ui.launchShortcuts">
- <shortcut
- class="org.eclipse.linuxtools.internal.valgrind.launch.remote.ValgrindRemoteLaunchShortcut"
- icon="icons/valgrind-icon.png"
- id="org.eclipse.linuxtools.valgrind.launch.remote.shortcut"
- label="%shortcut.label"
- modes="linuxtools">
- </shortcut>
- </extension>
-
-</plugin>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/pom.xml
deleted file mode 100644
index adf93aca69..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2011, 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
--->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>linuxtools-valgrind-parent</artifactId>
- <groupId>org.eclipse.linuxtools.valgrind</groupId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.eclipse.linuxtools.valgrind.launch.remote</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-
- <name>Linux Tools Valgrind Remote Launch Plug-in</name>
-
- <build>
- <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/Messages.java b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/Messages.java
deleted file mode 100644
index 4b662629a0..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/Messages.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Elliott Baron
- * 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:
- * Elliott Baron <ebaron@fedoraproject.org> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.valgrind.launch.remote;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.valgrind.launch.remote.messages"; //$NON-NLS-1$
- public static String ValgrindRemoteLaunchDelegate_error_launch_failed;
- public static String ValgrindRemoteLaunchDelegate_error_no_fs;
- public static String ValgrindRemoteLaunchDelegate_error_no_peers;
- public static String ValgrindRemoteLaunchDelegate_error_no_proc;
- public static String ValgrindRemoteLaunchDelegate_error_no_streams;
- public static String ValgrindRemoteLaunchDelegate_task_name;
- public static String ValgrindRemoteProcess_error_proc_not_term;
- public static String ValgrindRemoteTab_error_dest_wd;
- public static String ValgrindRemoteTab_error_location_VG;
- public static String ValgrindRemoteTab_error_peer;
- public static String ValgrindRemoteTab_error_tmp_dir;
- public static String ValgrindRemoteTab_header_ID;
- public static String ValgrindRemoteTab_header_name;
- public static String ValgrindRemoteTab_header_OS;
- public static String ValgrindRemoteTab_header_transport;
- public static String ValgrindRemoteTab_label_dest_wd;
- public static String ValgrindRemoteTab_label_location_VG;
- public static String ValgrindRemoteTab_label_peers;
- public static String ValgrindRemoteTab_label_tmp_dir;
- public static String ValgrindRemoteTab_tab_name;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
-}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchConstants.java b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchConstants.java
deleted file mode 100644
index abbe61f01b..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchConstants.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Elliott Baron
- * 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:
- * Elliott Baron <ebaron@fedoraproject.org> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.valgrind.launch.remote;
-
-public final class ValgrindRemoteLaunchConstants {
-
- private static final String PLUGIN_ID = "org.eclipse.linuxtools.valgrind.launch.remote"; //$NON-NLS-1$
-
- public static final String ATTR_REMOTE_VALGRINDLOC = PLUGIN_ID + ".REMOTE_VALGRINDLOC"; //$NON-NLS-1$
- public static final String ATTR_REMOTE_DESTDIR = PLUGIN_ID + ".REMOTE_DESTDIR"; //$NON-NLS-1$
- public static final String ATTR_REMOTE_OUTPUTDIR = PLUGIN_ID + ".REMOTE_OUTPUTDIR"; //$NON-NLS-1$
-
- public static final String DEFAULT_REMOTE_VALGRINDLOC = "/usr/bin/valgrind"; //$NON-NLS-1$
- public static final String DEFAULT_REMOTE_DESTDIR = null;
- public static final String DEFAULT_REMOTE_OUTPUTDIR = "/tmp"; //$NON-NLS-1$
-
-}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchDelegate.java b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchDelegate.java
deleted file mode 100644
index aa1cdd0248..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchDelegate.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Elliott Baron
- * 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:
- * Elliott Baron <ebaron@fedoraproject.org> - initial API and implementation
- * Red Hat Inc. - rewrite to use RemoteConnection class
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.valgrind.launch.remote;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Map;
-
-import org.eclipse.cdt.debug.core.CDebugUtils;
-import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.linuxtools.internal.valgrind.launch.ValgrindLaunchConfigurationDelegate;
-import org.eclipse.linuxtools.internal.valgrind.launch.ValgrindLaunchPlugin;
-import org.eclipse.linuxtools.internal.valgrind.ui.ValgrindUIPlugin;
-import org.eclipse.linuxtools.internal.valgrind.ui.ValgrindViewPart;
-import org.eclipse.linuxtools.profiling.launch.RemoteConnectionException;
-import org.eclipse.linuxtools.profiling.launch.remote.RemoteConnection;
-import org.eclipse.linuxtools.valgrind.core.IValgrindMessage;
-import org.eclipse.linuxtools.valgrind.launch.IValgrindOutputDirectoryProvider;
-
-public class ValgrindRemoteLaunchDelegate extends
-ValgrindLaunchConfigurationDelegate {
-
- private SubMonitor monitor;
- private IPath localOutputDir;
- private IPath remoteBinFile;
- private RemoteConnection rc;
-
- @Override
- public void launch(final ILaunchConfiguration config, String mode,
- final ILaunch launch, IProgressMonitor m) throws CoreException {
- if (m == null) {
- m = new NullProgressMonitor();
- }
-
- // Clear process as we wait on it to be instantiated
- process = null;
-
- monitor = SubMonitor
- .convert(
- m,
- Messages.ValgrindRemoteLaunchDelegate_task_name, 10);
- // check for cancellation
- if (monitor.isCanceled()) {
- return;
- }
-
- this.config = config;
- this.launch = launch;
- try {
- // remove any output from previous run
- ValgrindUIPlugin.getDefault().resetView();
- // reset stored launch data
- getPlugin().setCurrentLaunchConfiguration(null);
- getPlugin().setCurrentLaunch(null);
-
- rc = new RemoteConnection(config);
- monitor.worked(1);
-
- // Copy binary using FileSystem service
- final IPath exePath = CDebugUtils.verifyProgramPath(config);
- final IPath remoteDir = Path.fromOSString(config.getAttribute(ValgrindRemoteLaunchConstants.ATTR_REMOTE_DESTDIR, ValgrindRemoteLaunchConstants.DEFAULT_REMOTE_DESTDIR));
-
- remoteBinFile = remoteDir.append(exePath.lastSegment());
-
- rc.upload(exePath, remoteDir, new SubProgressMonitor(monitor, 1));
-
- IPath remoteLogDir = Path.fromOSString(config.getAttribute(ValgrindRemoteLaunchConstants.ATTR_REMOTE_OUTPUTDIR, ValgrindRemoteLaunchConstants.DEFAULT_REMOTE_OUTPUTDIR));
- outputPath = remoteLogDir.append("eclipse-valgrind-" + System.currentTimeMillis()); //$NON-NLS-1$
-
- rc.createFolder(outputPath, new SubProgressMonitor(monitor, 1));
-
- // Retrieve user-defined Valgrind binary location
- final IPath valgrindLocation = Path.fromOSString(config.getAttribute(ValgrindRemoteLaunchConstants.ATTR_REMOTE_VALGRINDLOC, ValgrindRemoteLaunchConstants.DEFAULT_REMOTE_VALGRINDLOC));
- String[] arguments = getProgramArgumentsArray(config);
- // create/empty local output directory
- IValgrindOutputDirectoryProvider provider = getPlugin().getOutputDirectoryProvider();
- try {
- localOutputDir = provider.getOutputPath();
- createDirectory(localOutputDir);
- } catch (IOException e2) {
- // TODO Auto-generated catch block
- e2.printStackTrace();
- }
-
- // tool that was launched
- toolID = getTool(config);
- // ask tool extension for arguments
- dynamicDelegate = getDynamicDelegate(toolID);
- String[] opts = getValgrindArgumentsArray(config);
- @SuppressWarnings({ "unused", "unchecked" })
- Map<String, String> env = config.getAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, (Map<String, String>) null);
- @SuppressWarnings("unused")
- boolean usePty = config.getAttribute(
- ICDTLaunchConfigurationConstants.ATTR_USE_TERMINAL,
- ICDTLaunchConfigurationConstants.USE_TERMINAL_DEFAULT);
-
- StringBuilder command = new StringBuilder();
- command.append(valgrindLocation.toString());
- // Add valgrind options
- for (String opt : opts) {
- command.append(" ").append(opt); //$NON-NLS-1$
- }
- // Add executable to run
- command.append(" ").append(remoteBinFile.toString()); //$NON-NLS-1$
- // Add arguments to pass to executable
- for (String argument : arguments) {
- command.append(" ").append(argument); //$NON-NLS-1$
- }
- ArrayList<String> commandOutput = new ArrayList<String>();
- int returnValue = rc.runCommand(command.toString(), remoteDir, commandOutput, new SubProgressMonitor(monitor, 1));
-
- // delete remote binary
- rc.delete(remoteBinFile, new SubProgressMonitor(monitor, 1));
-
- if (returnValue == 0)
- // move remote log files to local directory
- rc.download(outputPath, localOutputDir, new SubProgressMonitor(monitor, 1));
-
- // remove remote log dir and all files under it
- rc.delete(outputPath, new SubProgressMonitor(monitor, 1));
-
- if (returnValue != 0) {
- StringBuffer buf = new StringBuffer();
- for (int i = 0; i < commandOutput.size(); ++i) {
- buf.append(commandOutput.get(i));
- buf.append("\n"); //$NON-NLS-1$
- }
- abort(buf.toString(), null, ICDTLaunchConfigurationConstants.ERR_INTERNAL_ERROR);
- }
-
- // store these for use by other classes
- getPlugin().setCurrentLaunchConfiguration(config);
- getPlugin().setCurrentLaunch(launch);
-
- // parse Valgrind logs
- IValgrindMessage[] messages = parseLogs(localOutputDir);
-
- // create launch summary string to distinguish this launch
- launchStr = createLaunchStr();
-
- // create view
- ValgrindUIPlugin.getDefault().createView(launchStr, toolID);
- // set log messages
- ValgrindViewPart view = ValgrindUIPlugin.getDefault().getView();
- view.setMessages(messages);
- monitor.worked(1);
-
- // pass off control to extender
- dynamicDelegate.handleLaunch(config, launch, localOutputDir, monitor.newChild(2));
-
- // initialize tool-specific part of view
- dynamicDelegate.initializeView(view.getDynamicView(), launchStr, monitor.newChild(1));
-
- // refresh view
- ValgrindUIPlugin.getDefault().refreshView();
-
- // show view
- ValgrindUIPlugin.getDefault().showView();
- monitor.worked(1);
-
-
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (RemoteConnectionException e) {
- // TODO Auto-generated catch block
- abort(e.getLocalizedMessage(), null, ICDTLaunchConfigurationConstants.ERR_INTERNAL_ERROR);
- } finally {
- monitor.done();
- m.done();
- }
- }
-
-
- @Override
- protected String createLaunchStr() {
- return config.getName()
- + " [" + getPlugin().getToolName(toolID) + " on " + rc.getId() + "] "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- @Override
- protected String getPluginID() {
- return ValgrindLaunchPlugin.PLUGIN_ID;
- }
-
- public void onError(Throwable t) {
- // for now do nothing
- }
-
-} \ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchShortcut.java b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchShortcut.java
deleted file mode 100644
index 3363033d74..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchShortcut.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Elliott Baron
- * 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:
- * Elliott Baron <ebaron@fedoraproject.org> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.valgrind.launch.remote;
-
-import org.eclipse.linuxtools.internal.valgrind.launch.ValgrindLaunchShortcut;
-
-public class ValgrindRemoteLaunchShortcut extends ValgrindLaunchShortcut {
-
-}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchTabGroup.java b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchTabGroup.java
deleted file mode 100644
index be89c68aca..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchTabGroup.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Elliott Baron
- * 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:
- * Elliott Baron <ebaron@fedoraproject.org> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.valgrind.launch.remote;
-
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.linuxtools.internal.valgrind.launch.ValgrindOptionsTab;
-import org.eclipse.linuxtools.profiling.launch.remote.ProfileRemoteLaunchConfigurationTabGroup;
-
-public class ValgrindRemoteLaunchTabGroup extends
- ProfileRemoteLaunchConfigurationTabGroup {
-
- @Override
- public AbstractLaunchConfigurationTab[] getProfileTabs() {
- return new AbstractLaunchConfigurationTab[] { new ValgrindRemoteTab(), new ValgrindOptionsTab(false) };
- }
-
-}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemotePlugin.java b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemotePlugin.java
deleted file mode 100644
index 8468b37465..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemotePlugin.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Elliott Baron
- * 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:
- * Elliott Baron <ebaron@fedoraproject.org> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.valgrind.launch.remote;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class ValgrindRemotePlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.linuxtools.valgrind.launch.remote"; //$NON-NLS-1$
-
- // The shared instance
- private static ValgrindRemotePlugin plugin;
-
- /**
- * The constructor
- */
- public ValgrindRemotePlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static ValgrindRemotePlugin getDefault() {
- return plugin;
- }
-
-}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteTab.java b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteTab.java
deleted file mode 100644
index b353eec621..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteTab.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Elliott Baron
- * 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:
- * Elliott Baron <ebaron@fedoraproject.org> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.valgrind.launch.remote;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.linuxtools.profiling.launch.remote.RemoteTab;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-public class ValgrindRemoteTab extends RemoteTab {
-
- private Text destDirText;
- private Text tmpDirText;
- private Text valgrindLocText;
- private boolean isInitializing;
-
- public ValgrindRemoteTab() {
- super(Messages.ValgrindRemoteTab_tab_name);
- }
-
- @Override
- protected void localCreateControl(Composite top) {
-
- Composite pathTop = new Composite(top, SWT.NONE);
- pathTop.setLayout(new GridLayout(2, false));
- pathTop.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
- // Valgrind location
- Label valgrindLocLabel = new Label(pathTop, SWT.NONE);
- valgrindLocLabel.setText(Messages.ValgrindRemoteTab_label_location_VG);
-
- valgrindLocText = new Text(pathTop, SWT.BORDER);
- valgrindLocText.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
- valgrindLocText.addModifyListener(new ModifyListener() {
-
- public void modifyText(ModifyEvent e) {
- updateLaunchConfigurationDialog();
- }
- });
-
- // Destination directory
- Label destDirLabel = new Label(pathTop, SWT.NONE);
- destDirLabel.setText(Messages.ValgrindRemoteTab_label_dest_wd);
-
- destDirText = new Text(pathTop, SWT.BORDER);
- destDirText.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
- destDirText.addModifyListener(new ModifyListener() {
-
- public void modifyText(ModifyEvent e) {
- updateLaunchConfigurationDialog();
- }
- });
-
- Label tmpDirLabel = new Label(pathTop, SWT.NONE);
- tmpDirLabel.setText(Messages.ValgrindRemoteTab_label_tmp_dir);
-
- tmpDirText = new Text(pathTop, SWT.BORDER);
- tmpDirText.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
- tmpDirText.addModifyListener(new ModifyListener() {
-
- public void modifyText(ModifyEvent e) {
- updateLaunchConfigurationDialog();
- }
- });
- }
-
- @Override
- public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
- super.setDefaults(configuration);
- configuration.setAttribute(ValgrindRemoteLaunchConstants.ATTR_REMOTE_VALGRINDLOC, ValgrindRemoteLaunchConstants.DEFAULT_REMOTE_VALGRINDLOC);
- configuration.setAttribute(ValgrindRemoteLaunchConstants.ATTR_REMOTE_DESTDIR, ValgrindRemoteLaunchConstants.DEFAULT_REMOTE_DESTDIR);
- configuration.setAttribute(ValgrindRemoteLaunchConstants.ATTR_REMOTE_OUTPUTDIR, ValgrindRemoteLaunchConstants.DEFAULT_REMOTE_OUTPUTDIR);
- }
-
- @Override
- public void localInitializeFrom(ILaunchConfiguration configuration) throws CoreException {
-
- String valgrindLoc = configuration.getAttribute(ValgrindRemoteLaunchConstants.ATTR_REMOTE_VALGRINDLOC, ValgrindRemoteLaunchConstants.DEFAULT_REMOTE_VALGRINDLOC);
- if (valgrindLoc != null) {
- valgrindLocText.setText(valgrindLoc);
- }
-
- String destDir = configuration.getAttribute(ValgrindRemoteLaunchConstants.ATTR_REMOTE_DESTDIR, ValgrindRemoteLaunchConstants.DEFAULT_REMOTE_DESTDIR);
- if (destDir != null) {
- destDirText.setText(destDir);
- }
-
- String tmpDir = configuration.getAttribute(ValgrindRemoteLaunchConstants.ATTR_REMOTE_OUTPUTDIR, ValgrindRemoteLaunchConstants.DEFAULT_REMOTE_OUTPUTDIR);
- if (tmpDir != null) {
- tmpDirText.setText(tmpDir);
- }
- }
-
- @Override
- public void performApply(ILaunchConfigurationWorkingCopy configuration) {
- super.performApply(configuration);
- configuration.setAttribute(ValgrindRemoteLaunchConstants.ATTR_REMOTE_VALGRINDLOC, valgrindLocText.getText());
- configuration.setAttribute(ValgrindRemoteLaunchConstants.ATTR_REMOTE_DESTDIR, destDirText.getText());
- configuration.setAttribute(ValgrindRemoteLaunchConstants.ATTR_REMOTE_OUTPUTDIR, tmpDirText.getText());
- }
-
- @Override
- public boolean isValid(ILaunchConfiguration launchConfig) {
- boolean valid = super.isValid(launchConfig);
- if (valid) {
- valid = valgrindLocText.getText().length() > 0;
- if (valid) {
- valid = destDirText.getText().length() > 0;
- if (valid) {
- valid = tmpDirText.getText().length() > 0;
- if (!valid) {
- setErrorMessage(Messages.ValgrindRemoteTab_error_tmp_dir);
- }
- }
- else {
- setErrorMessage(Messages.ValgrindRemoteTab_error_dest_wd);
- }
- }
- else {
- setErrorMessage(Messages.ValgrindRemoteTab_error_location_VG);
- }
- }
- else {
- setErrorMessage(Messages.ValgrindRemoteTab_error_peer);
- }
-
- return valid;
- }
-
- @Override
- public String getName() {
- return Messages.ValgrindRemoteTab_tab_name;
- }
-
- @Override
- protected void updateLaunchConfigurationDialog() {
- if (!isInitializing) {
- super.updateLaunchConfigurationDialog();
- }
- }
-}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/messages.properties b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/messages.properties
deleted file mode 100644
index d8a4396109..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/messages.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-ValgrindRemoteLaunchDelegate_error_launch_failed=Launch failed.
-ValgrindRemoteLaunchDelegate_error_no_fs=FileSystem service is unavailable on target.
-ValgrindRemoteLaunchDelegate_error_no_peers=TCF peer: {0} is unavailable.
-ValgrindRemoteLaunchDelegate_error_no_proc=Processes service is unavailable on target.
-ValgrindRemoteLaunchDelegate_error_no_streams=Streams service is unavailable on target.
-ValgrindRemoteLaunchDelegate_task_name=Profiling Remote C/C++ Application
-ValgrindRemoteProcess_error_proc_not_term=Process has not terminated.
-ValgrindRemoteTab_error_dest_wd=Please specify destination/working directory.
-ValgrindRemoteTab_error_location_VG=Please specify the location of the Valgrind binary.
-ValgrindRemoteTab_error_peer=An RSE host must be selected.
-ValgrindRemoteTab_error_tmp_dir=Please specify temporary files directory.
-ValgrindRemoteTab_header_ID=ID
-ValgrindRemoteTab_header_name=Name
-ValgrindRemoteTab_header_OS=OS
-ValgrindRemoteTab_header_transport=Transport
-ValgrindRemoteTab_label_dest_wd=Destination/working directory:
-ValgrindRemoteTab_label_location_VG=Location of Valgrind binary:
-ValgrindRemoteTab_label_peers=Available TCF Peers:
-ValgrindRemoteTab_label_tmp_dir=Temporary files directory:
-ValgrindRemoteTab_tab_name=Target
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.launch/META-INF/MANIFEST.MF
index f14694097d..547c9e9456 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.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.valgrind.launch;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.eclipse.linuxtools.internal.valgrind.launch.ValgrindLaunchPlugin
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.eclipse.ui,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/plugin.properties b/valgrind/org.eclipse.linuxtools.valgrind.launch/plugin.properties
index e2e3d33db8..ab6b09c7b8 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/plugin.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/plugin.properties
@@ -1,6 +1,8 @@
#Properties file for org.eclipse.linuxtools.valgrind.launch
launchConfigurationType.name.0 = Profile With Valgrind
launchConfigurationTabGroup.description.0 = Profile C/C++ Application Using Valgrind
+launchConfigurationType.remote.name = Profile With Valgrind (Remote)
+launchConfigurationTabGroup.remote.description = Profile Remote C/C++ Application Using Valgrind
shortcut.label.0 = Profile With Valgrind
Bundle-Vendor.0 = Eclipse Linux Tools
Bundle-Name.0 = Valgrind Launch Plug-in
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/plugin.xml b/valgrind/org.eclipse.linuxtools.valgrind.launch/plugin.xml
index b235d54aa9..bed9b747e1 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/plugin.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/plugin.xml
@@ -14,6 +14,15 @@
sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
</launchConfigurationType>
+ <launchConfigurationType
+ delegate="org.eclipse.linuxtools.internal.valgrind.launch.ValgrindRemoteProxyLaunchDelegate"
+ id="org.eclipse.linuxtools.valgrind.launch.remote.launchConfigurationType"
+ modes="linuxtools"
+ name="%launchConfigurationType.remote.name"
+ public="true"
+ sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
+ sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
+ </launchConfigurationType>
</extension>
<extension
point="org.eclipse.debug.ui.launchConfigurationTabGroups">
@@ -23,6 +32,12 @@
id="org.eclipse.linuxtools.valgrind.launch.valgrindTabGroup"
type="org.eclipse.linuxtools.valgrind.launch.valgrindLaunch">
</launchConfigurationTabGroup>
+ <launchConfigurationTabGroup
+ class="org.eclipse.linuxtools.internal.valgrind.launch.ValgrindRemoteProxyLaunchConfigurationTabGroup"
+ description="%launchConfigurationTabGroup.remote.description"
+ id="org.eclipse.linuxtools.valgrind.launch.remote.tabGroup"
+ type="org.eclipse.linuxtools.valgrind.launch.remote.launchConfigurationType">
+ </launchConfigurationTabGroup>
</extension>
<extension
point="org.eclipse.debug.ui.launchConfigurationTypeImages">
@@ -31,6 +46,11 @@
icon="icons/valgrind-icon.png"
id="org.eclipse.linuxtools.valgrind.launch.valgrindImage">
</launchConfigurationTypeImage>
+ <launchConfigurationTypeImage
+ configTypeID="org.eclipse.linuxtools.valgrind.launch.remote.launchConfigurationType"
+ icon="icons/valgrind-icon.png"
+ id="org.eclipse.linuxtools.valgrind.launch.remote.launchConfigurationTypeImage1">
+ </launchConfigurationTypeImage>
</extension>
<extension
point="org.eclipse.debug.ui.launchShortcuts">
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.launch/pom.xml
index 8abc64c7d7..895bfc8e92 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/pom.xml
@@ -18,7 +18,7 @@
</parent>
<artifactId>org.eclipse.linuxtools.valgrind.launch</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<name>Linux Tools Valgrind Launch Plug-in</name>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/feature.xml b/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/feature.xml
index 89f680113c..9b4922457f 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/feature.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.valgrind.remote"
label="%featureName"
- version="1.0.0.qualifier"
+ version="2.0.0.qualifier"
provider-name="%featureProvider"
os="linux,macosx">
@@ -23,29 +23,8 @@
</url>
<requires>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.cdt.core"/>
- <import plugin="org.eclipse.cdt.debug.core"/>
- <import plugin="org.eclipse.cdt.launch"/>
- <import plugin="org.eclipse.core.filesystem"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.debug.core"/>
- <import plugin="org.eclipse.debug.ui"/>
- <import plugin="org.eclipse.linuxtools.profiling.launch.remote"/>
- <import plugin="org.eclipse.linuxtools.valgrind.core"/>
- <import plugin="org.eclipse.linuxtools.valgrind.launch"/>
- <import plugin="org.eclipse.linuxtools.valgrind.ui"/>
- <import plugin="org.eclipse.linuxtools.profiling.launch"/>
<import feature="org.eclipse.linuxtools.valgrind" version="0.8.0" match="greaterOrEqual"/>
<import feature="org.eclipse.linuxtools.profiling.remote" version="0.8.0" match="greaterOrEqual"/>
</requires>
- <plugin
- id="org.eclipse.linuxtools.valgrind.launch.remote"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/pom.xml
index b6d240ea1c..0dd6ed2b62 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/pom.xml
@@ -18,7 +18,7 @@
</parent>
<artifactId>org.eclipse.linuxtools.valgrind.remote</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<name>Linux Tools Valgrind Tools Remote Integration Feature</name>
diff --git a/valgrind/pom.xml b/valgrind/pom.xml
index 7387df1ffa..ee6d2eedac 100644
--- a/valgrind/pom.xml
+++ b/valgrind/pom.xml
@@ -52,7 +52,6 @@
<module>org.eclipse.linuxtools.valgrind.helgrind</module>
<module>org.eclipse.linuxtools.valgrind.helgrind.tests</module>
<module>org.eclipse.linuxtools.valgrind.launch</module>
- <module>org.eclipse.linuxtools.valgrind.launch.remote</module>
<module>org.eclipse.linuxtools.valgrind.massif</module>
<module>org.eclipse.linuxtools.valgrind.massif.tests</module>
<module>org.eclipse.linuxtools.valgrind.memcheck</module>

Back to the top