|
 |
eb77a4 |
diff -up ./profiling/org.eclipse.linuxtools.tools.launch.core/plugin.properties.fix ./profiling/org.eclipse.linuxtools.tools.launch.core/plugin.properties
|
|
|
eb77a4 |
--- ./profiling/org.eclipse.linuxtools.tools.launch.core/plugin.properties.fix 2013-11-19 17:39:16.596385931 -0500
|
|
|
eb77a4 |
+++ ./profiling/org.eclipse.linuxtools.tools.launch.core/plugin.properties 2013-11-19 17:39:52.627378883 -0500
|
|
|
eb77a4 |
@@ -10,3 +10,4 @@
|
|
|
eb77a4 |
#################################################################################
|
|
|
eb77a4 |
bundleName=Tools Launcher Core
|
|
|
eb77a4 |
provider=Eclipse Linux Tools
|
|
|
eb77a4 |
+BaseRHEL=Base RHEL Tools
|
|
|
eb77a4 |
diff -up ./profiling/org.eclipse.linuxtools.tools.launch.core/plugin.xml.fix ./profiling/org.eclipse.linuxtools.tools.launch.core/plugin.xml
|
|
|
eb77a4 |
--- ./profiling/org.eclipse.linuxtools.tools.launch.core/plugin.xml.fix 2013-11-19 17:36:47.926415013 -0500
|
|
|
eb77a4 |
+++ ./profiling/org.eclipse.linuxtools.tools.launch.core/plugin.xml 2013-11-19 17:39:06.732387851 -0500
|
|
|
eb77a4 |
@@ -2,4 +2,10 @@
|
|
|
eb77a4 |
|
|
|
eb77a4 |
<plugin>
|
|
|
eb77a4 |
<extension-point id="LinuxtoolsPathOptions" name="LinuxtoolsPathOptions" schema="schema/LinuxtoolsPathOptions.exsd"/>
|
|
|
eb77a4 |
+ <extension point="org.eclipse.linuxtools.tools.launch.core.LinuxtoolsPathOptions">
|
|
|
eb77a4 |
+
|
|
|
eb77a4 |
+ path="/usr/bin"
|
|
|
eb77a4 |
+ default="false">
|
|
|
eb77a4 |
+ </option>
|
|
|
eb77a4 |
+ </extension>
|
|
|
eb77a4 |
</plugin>
|
|
|
eb77a4 |
diff --git profiling/org.eclipse.linuxtools.tools.launch.core/src/org/eclipse/linuxtools/tools/launch/core/factory/LinuxtoolsProcessFactory.java profiling/org.eclipse.linuxtools.tools.launch.core/src/org/eclipse/linuxtools/tools/launch/core/factory/LinuxtoolsProcessFactory.java
|
|
|
eb77a4 |
index a553bae..fb4aaf2 100644
|
|
|
eb77a4 |
--- profiling/org.eclipse.linuxtools.tools.launch.core/src/org/eclipse/linuxtools/tools/launch/core/factory/LinuxtoolsProcessFactory.java
|
|
|
eb77a4 |
+++ profiling/org.eclipse.linuxtools.tools.launch.core/src/org/eclipse/linuxtools/tools/launch/core/factory/LinuxtoolsProcessFactory.java
|
|
|
eb77a4 |
@@ -88,6 +88,14 @@ public abstract class LinuxtoolsProcessFactory {
|
|
|
eb77a4 |
newPath.append(systemPath);
|
|
|
eb77a4 |
}
|
|
|
eb77a4 |
|
|
|
eb77a4 |
+ /*
|
|
|
eb77a4 |
+ * '/usr/bin' is set by 'Base RHEL Tools'
|
|
|
eb77a4 |
+ * Disable any XDG_DATA_DIRS in this case.
|
|
|
eb77a4 |
+ */
|
|
|
eb77a4 |
+ if (ltPath.equals("/usr/bin")) {
|
|
|
eb77a4 |
+ envMap.remove("XDG_DATA_DIRS");
|
|
|
eb77a4 |
+ }
|
|
|
eb77a4 |
+
|
|
|
eb77a4 |
// Overwrite/update map of system environment variables with ones from the provided array
|
|
|
eb77a4 |
if (newPath.length() > PATH_EQUAL.length()) {
|
|
|
eb77a4 |
envMap.put(PATH, newPath.substring(PATH_EQUAL.length()));
|