From 9298e69568d4f9387af5674962498903fd836521 Mon Sep 17 00:00:00 2001
From: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Date: Wed, 14 Jan 2015 15:23:37 -0500
Subject: [PATCH] Fix path to look for Mylyn Wikitext in case of shared
 installations

${eclipse.home} works correctly in the case where the Mylyn plugins are under
the Eclipse installation but it does not work in the case of bundle pools,
for example /home/user/.p2/pool/plugins. Instead, ${osgi.syspath} can be used.

Change-Id: Ife437c6efe1b7677210cd5cb444cf689c4384874
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/39626
Reviewed-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-by: Hudson CI
---
 .../.externalToolBuilders/Help Builder.launch                 | 3 ---
 org.eclipse.tracecompass.gdbtrace.help/build.xml              | 4 ++--
 .../.externalToolBuilders/Lttng Help Build.launch             | 3 ---
 org.eclipse.tracecompass.help/build.xml                       | 4 ++--
 .../.externalToolBuilders/RCP Help Builder.launch             | 3 ---
 org.eclipse.tracecompass.rcp.help/build.xml                   | 4 ++--
 ...org.eclipse.linuxtools.tmf.help build.xml [Builder].launch | 3 ---
 org.eclipse.tracecompass.tmf.help/build.xml                   | 4 ++--
 ...clipse.linuxtools.tmf.pcap.help build.xml [Builder].launch | 3 ---
 org.eclipse.tracecompass.tmf.pcap.help/build.xml              | 4 ++--
 10 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/org.eclipse.tracecompass.gdbtrace.help/.externalToolBuilders/Help Builder.launch b/org.eclipse.tracecompass.gdbtrace.help/.externalToolBuilders/Help Builder.launch
index 0c8b7ea75c..563841dc18 100644
--- a/org.eclipse.tracecompass.gdbtrace.help/.externalToolBuilders/Help Builder.launch	
+++ b/org.eclipse.tracecompass.gdbtrace.help/.externalToolBuilders/Help Builder.launch	
@@ -8,9 +8,6 @@
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.tracecompass.gdbtrace.help"/>
-<mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES">
-<mapEntry key="eclipse.home" value="${eclipse_home}"/>
-</mapAttribute>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tracecompass.gdbtrace.help/build.xml}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,clean"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
diff --git a/org.eclipse.tracecompass.gdbtrace.help/build.xml b/org.eclipse.tracecompass.gdbtrace.help/build.xml
index 35b6b163e8..3e53397611 100644
--- a/org.eclipse.tracecompass.gdbtrace.help/build.xml
+++ b/org.eclipse.tracecompass.gdbtrace.help/build.xml
@@ -18,8 +18,8 @@
     <property name="ug.title" value="GDB Tracepoint Analysis User Guide" />
 
     <path id="wikitext.tasks.classpath">
-        <!-- Search in the local Eclipse installation directory for the Wikitext plugin -->
-        <fileset dir="${eclipse.home}/plugins" erroronmissingdir="false">
+        <!-- Search in the local Eclipse plugins directory for the Wikitext plugin -->
+        <fileset dir="${osgi.syspath}" erroronmissingdir="false">
             <include name="org.eclipse.mylyn.wikitext.*core*.jar" />
             <include name="com.google.guava_*.jar" />
         </fileset>
diff --git a/org.eclipse.tracecompass.help/.externalToolBuilders/Lttng Help Build.launch b/org.eclipse.tracecompass.help/.externalToolBuilders/Lttng Help Build.launch
index 3a8ca70338..8d4c5f6e7c 100644
--- a/org.eclipse.tracecompass.help/.externalToolBuilders/Lttng Help Build.launch	
+++ b/org.eclipse.tracecompass.help/.externalToolBuilders/Lttng Help Build.launch	
@@ -8,9 +8,6 @@
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.tracecompass.help"/>
-<mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES">
-<mapEntry key="eclipse.home" value="${eclipse_home}"/>
-</mapAttribute>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tracecompass.help/build.xml}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,clean"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
diff --git a/org.eclipse.tracecompass.help/build.xml b/org.eclipse.tracecompass.help/build.xml
index 0eb1716aed..cb1a51e0c5 100644
--- a/org.eclipse.tracecompass.help/build.xml
+++ b/org.eclipse.tracecompass.help/build.xml
@@ -10,8 +10,8 @@
     <property name="ug.title" value="LTTng Plug-in User Guide" />
 
     <path id="wikitext.tasks.classpath">
-        <!-- Search in the local Eclipse installation directory for the Wikitext plugin -->
-        <fileset dir="${eclipse.home}/plugins" erroronmissingdir="false">
+        <!-- Search in the local Eclipse plugins directory for the Wikitext plugin -->
+        <fileset dir="${osgi.syspath}" erroronmissingdir="false">
             <include name="org.eclipse.mylyn.wikitext.*core*.jar" />
             <include name="com.google.guava_*.jar" />
         </fileset>
diff --git a/org.eclipse.tracecompass.rcp.help/.externalToolBuilders/RCP Help Builder.launch b/org.eclipse.tracecompass.rcp.help/.externalToolBuilders/RCP Help Builder.launch
index 34b95f67bd..6aa5c9db33 100644
--- a/org.eclipse.tracecompass.rcp.help/.externalToolBuilders/RCP Help Builder.launch	
+++ b/org.eclipse.tracecompass.rcp.help/.externalToolBuilders/RCP Help Builder.launch	
@@ -8,9 +8,6 @@
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.tracecompass.rcp.help"/>
-<mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES">
-<mapEntry key="eclipse.home" value="${eclipse_home}"/>
-</mapAttribute>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tracecompass.rcp.help/build.xml}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,clean"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
diff --git a/org.eclipse.tracecompass.rcp.help/build.xml b/org.eclipse.tracecompass.rcp.help/build.xml
index 9f4b956867..fa64be0794 100644
--- a/org.eclipse.tracecompass.rcp.help/build.xml
+++ b/org.eclipse.tracecompass.rcp.help/build.xml
@@ -10,8 +10,8 @@
     <property name="ug.title" value="Trace Viewer User Guide" />
 
     <path id="wikitext.tasks.classpath">
-        <!-- Search in the local Eclipse installation directory for the Wikitext plugin -->
-        <fileset dir="${eclipse.home}/plugins" erroronmissingdir="false">
+        <!-- Search in the local Eclipse plugins directory for the Wikitext plugin -->
+        <fileset dir="${osgi.syspath}" erroronmissingdir="false">
             <include name="org.eclipse.mylyn.wikitext.*core*.jar" />
             <include name="com.google.guava_*.jar" />
         </fileset>
diff --git a/org.eclipse.tracecompass.tmf.help/.externalToolBuilders/org.eclipse.linuxtools.tmf.help build.xml [Builder].launch b/org.eclipse.tracecompass.tmf.help/.externalToolBuilders/org.eclipse.linuxtools.tmf.help build.xml [Builder].launch
index f5163f7369..1bcd994acc 100644
--- a/org.eclipse.tracecompass.tmf.help/.externalToolBuilders/org.eclipse.linuxtools.tmf.help build.xml [Builder].launch	
+++ b/org.eclipse.tracecompass.tmf.help/.externalToolBuilders/org.eclipse.linuxtools.tmf.help build.xml [Builder].launch	
@@ -14,9 +14,6 @@
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.tracecompass.tmf.help"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES">
-<mapEntry key="eclipse.home" value="${eclipse_home}"/>
-</mapAttribute>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tracecompass.tmf.help/build.xml}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,clean"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
diff --git a/org.eclipse.tracecompass.tmf.help/build.xml b/org.eclipse.tracecompass.tmf.help/build.xml
index 6499418f96..3ca59769ee 100644
--- a/org.eclipse.tracecompass.tmf.help/build.xml
+++ b/org.eclipse.tracecompass.tmf.help/build.xml
@@ -7,8 +7,8 @@
    <property name="ug.title" value="TMF Developer Guide" />
 
     <path id="wikitext.tasks.classpath">
-        <!-- Search in the local Eclipse installation directory for the Wikitext plugin -->
-        <fileset dir="${eclipse.home}/plugins" erroronmissingdir="false">
+        <!-- Search in the local Eclipse plugins directory for the Wikitext plugin -->
+        <fileset dir="${osgi.syspath}" erroronmissingdir="false">
             <include name="org.eclipse.mylyn.wikitext.*core*.jar" />
             <include name="com.google.guava_*.jar" />
         </fileset>
diff --git a/org.eclipse.tracecompass.tmf.pcap.help/.externalToolBuilders/org.eclipse.linuxtools.tmf.pcap.help build.xml [Builder].launch b/org.eclipse.tracecompass.tmf.pcap.help/.externalToolBuilders/org.eclipse.linuxtools.tmf.pcap.help build.xml [Builder].launch
index b8c9640296..69500cee67 100644
--- a/org.eclipse.tracecompass.tmf.pcap.help/.externalToolBuilders/org.eclipse.linuxtools.tmf.pcap.help build.xml [Builder].launch	
+++ b/org.eclipse.tracecompass.tmf.pcap.help/.externalToolBuilders/org.eclipse.linuxtools.tmf.pcap.help build.xml [Builder].launch	
@@ -14,9 +14,6 @@
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.tracecompass.tmf.pcap.help"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES">
-<mapEntry key="eclipse.home" value="${eclipse_home}"/>
-</mapAttribute>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tracecompass.tmf.pcap.help/build.xml}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,clean"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
diff --git a/org.eclipse.tracecompass.tmf.pcap.help/build.xml b/org.eclipse.tracecompass.tmf.pcap.help/build.xml
index c803b84fdc..5236363f80 100644
--- a/org.eclipse.tracecompass.tmf.pcap.help/build.xml
+++ b/org.eclipse.tracecompass.tmf.pcap.help/build.xml
@@ -7,8 +7,8 @@
    <property name="ug.title" value="Pcap Network Tracing User Guide" />
 
     <path id="wikitext.tasks.classpath">
-        <!-- Search in the local Eclipse installation directory for the Wikitext plugin -->
-        <fileset dir="${eclipse.home}/plugins" erroronmissingdir="false">
+        <!-- Search in the local Eclipse plugins directory for the Wikitext plugin -->
+        <fileset dir="${osgi.syspath}" erroronmissingdir="false">
             <include name="org.eclipse.mylyn.wikitext.*core*.jar" />
             <include name="com.google.guava_*.jar" />
         </fileset>
-- 
2.34.1