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

diff --git a/org.eclipse.tracecompass.gdbtrace.help/.externalToolBuilders/Help Builder.launch b/org.eclipse.tracecompass.gdbtrace.help/.externalToolBuilders/Help Builder.launch
index 0c8b7ea75c1ad778749611ef22cad628b5ee62c0..563841dc18e944f035b7da2be5e6eed3f1cb0c61 100644 (file)
--- 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 35b6b163e823236a1b98d10665e5c38c7378d3ca..3e53397611e7534d56283fbec8ab5c8305b1e83b 100644 (file)
--- 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 3a8ca70338068962a4a4f1c1bbe37eb7f9461fac..8d4c5f6e7c0c37a765eca84eedc01651be721fb1 100644 (file)
--- 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 0eb1716aed249b0a463a67bf1df597bf0647f9c8..cb1a51e0c5e657e6fbf8439fd707564a1f3db8eb 100644 (file)
--- 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 34b95f67bdfc90baac46e012ab6eb417dc2d11f3..6aa5c9db33bdfebc5bfe2dbf093dc4b2bf6ce241 100644 (file)
--- 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 9f4b9568679c0b5047175e0d2a2b8e9025aed818..fa64be07941a5ef556affc4027ef3bd8b0440b72 100644 (file)
--- 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 f5163f736926d977a47affc687d4c0f2e640e51c..1bcd994accc743cea2ecc8176f771f28e3934577 100644 (file)
--- 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 6499418f965c71576f91f03b8d08add22a6d7b3e..3ca59769eeb4c14e1885757f884f0ece4e8b9795 100644 (file)
--- 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 b8c9640296c219f523e130d689771b459884edae..69500cee67f34c7eccc2f92e5e44a90cf61458be 100644 (file)
--- 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 c803b84fdca0c37a349935545688b0c8e76ee63d..5236363f8008a02828f9ebea7571d2cef71180fc 100644 (file)
--- 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>