releng: Build help plug-ins with Maven dependencies for Mylyn only
This matches commit 53182e0bfb74c7c275214c646f073feeb7195d16 of Trace
Compass, which removed mylyn from the target.
Change-Id: Ie349f95ad4b5c4c9d530c692b72f38ff1816d65b
Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net>
Reviewed-on: https://git.eclipse.org/r/151318
Tested-by: CI Bot
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
diff --git a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
index 5434e9d..6577897 100644
--- a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
+++ b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
@@ -1,16 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
-<target name="tracecompass-incubator-master" sequenceNumber="34">
+<target name="tracecompass-incubator-master" sequenceNumber="35">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/cdt/releases/9.9/cdt-9.9.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/mylyn/releases/3.21/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.linuxtools.dataviewers.feature.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/linuxtools/update-7.4.0/"/>
</location>
@@ -175,4 +171,4 @@
-Xmx512M</vmArgs>
<programArgs>-consolelog</programArgs>
</launcherArgs>
-</target>
\ No newline at end of file
+</target>
diff --git a/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch b/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
deleted file mode 100644
index cbcb2a3..0000000
--- a/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="build,build.index,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.tracecompass.incubator.atrace.doc.user" type="4"/> </resources>}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.tracecompass.incubator.atrace.doc.user/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<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.incubator.atrace.doc.user"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tracecompass.incubator.atrace.doc.user/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"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/.project b/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/.project
index 817e70a..0af4e15 100644
--- a/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/.project
+++ b/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/.project
@@ -6,20 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>clean,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch</value>
- </dictionary>
- <dictionary>
- <key>incclean</key>
- <value>true</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -32,6 +18,5 @@
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.mylyn.wikitext.ui.wikiTextNature</nature>
</natures>
</projectDescription>
diff --git a/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/build.properties b/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/build.properties
index d0aa0fe..a3f1047 100644
--- a/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/build.properties
+++ b/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/build.properties
@@ -13,8 +13,5 @@
plugin.properties,\
book.css,\
doc/
-jars.extra.classpath = platform:/plugin/org.eclipse.mylyn.wikitext.core,\
- platform:/plugin/org.eclipse.mylyn.wikitext.core.ant,\
- platform:/plugin/org.eclipse.mylyn.wikitext.mediawiki.core
src.includes = about.html
diff --git a/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/build.xml
index 6b985d5..4009fa1 100644
--- a/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/build.xml
@@ -6,18 +6,7 @@
<property name="document.title" value="Trace Compass for Android Traces User Guide" />
- <path id="wikitext.tasks.classpath">
- <!-- 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>
-
- <!-- For Maven builds: use the compile_classpath -->
- <pathelement path="${compile_classpath}" />
- </path>
-
- <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties" />
+ <taskdef resource="org/eclipse/mylyn/wikitext/ant/tasks.properties"/>
<target name="build" description="Generate Eclipse help content for the Trace Compass for Android Traces User Guide">
<wikitext-to-eclipse-help markupLanguage="MediaWiki"
diff --git a/doc/org.eclipse.tracecompass.incubator.callstack.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch b/doc/org.eclipse.tracecompass.incubator.callstack.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
deleted file mode 100644
index 814c90c..0000000
--- a/doc/org.eclipse.tracecompass.incubator.callstack.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="build,build.index,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.tracecompass.incubator.callstack.doc.user" type="4"/> </resources>}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.tracecompass.incubator.callstack.doc.user/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<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.incubator.callstack.doc.user"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tracecompass.incubator.callstack.doc.user/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"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/doc/org.eclipse.tracecompass.incubator.callstack.doc.user/.project b/doc/org.eclipse.tracecompass.incubator.callstack.doc.user/.project
index d5d1683..55325e0 100644
--- a/doc/org.eclipse.tracecompass.incubator.callstack.doc.user/.project
+++ b/doc/org.eclipse.tracecompass.incubator.callstack.doc.user/.project
@@ -6,20 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>clean,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch</value>
- </dictionary>
- <dictionary>
- <key>incclean</key>
- <value>true</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -32,6 +18,5 @@
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.mylyn.wikitext.ui.wikiTextNature</nature>
</natures>
</projectDescription>
diff --git a/doc/org.eclipse.tracecompass.incubator.callstack.doc.user/build.properties b/doc/org.eclipse.tracecompass.incubator.callstack.doc.user/build.properties
index 357afb9..43f0522 100644
--- a/doc/org.eclipse.tracecompass.incubator.callstack.doc.user/build.properties
+++ b/doc/org.eclipse.tracecompass.incubator.callstack.doc.user/build.properties
@@ -14,8 +14,5 @@
book.css,\
doc/,\
index/
-jars.extra.classpath = platform:/plugin/org.eclipse.mylyn.wikitext.core,\
- platform:/plugin/org.eclipse.mylyn.wikitext.core.ant,\
- platform:/plugin/org.eclipse.mylyn.wikitext.mediawiki.core
src.includes = about.html
diff --git a/doc/org.eclipse.tracecompass.incubator.callstack.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.callstack.doc.user/build.xml
index 8bc92bc..2bfc03e 100644
--- a/doc/org.eclipse.tracecompass.incubator.callstack.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.callstack.doc.user/build.xml
@@ -6,18 +6,7 @@
<property name="document.title" value="Trace Compass Incubator Callstack User Guide" />
- <path id="wikitext.tasks.classpath">
- <!-- 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>
-
- <!-- For Maven builds: use the compile_classpath -->
- <pathelement path="${compile_classpath}" />
- </path>
-
- <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties" />
+ <taskdef resource="org/eclipse/mylyn/wikitext/ant/tasks.properties"/>
<target name="build" description="Generate Eclipse help content for the Trace Compass Incubator Callstack User Guide">
<wikitext-to-eclipse-help markupLanguage="MediaWiki"
diff --git a/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch b/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
deleted file mode 100644
index 4fcf8d3..0000000
--- a/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="build,build.index,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.tracecompass.incubator.eventcount.doc.user" type="4"/> </resources>}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.tracecompass.incubator.eventcount.doc.user/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<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.incubator.eventcount.doc.user"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tracecompass.incubator.eventcount.doc.user/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"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/.project b/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/.project
index 56e60a3..f5bf6f1 100644
--- a/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/.project
+++ b/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/.project
@@ -6,20 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>clean,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch</value>
- </dictionary>
- <dictionary>
- <key>incclean</key>
- <value>true</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -32,6 +18,5 @@
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.mylyn.wikitext.ui.wikiTextNature</nature>
</natures>
</projectDescription>
diff --git a/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/build.properties b/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/build.properties
index 04c1d52..647368c 100644
--- a/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/build.properties
+++ b/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/build.properties
@@ -13,8 +13,5 @@
plugin.properties,\
book.css,\
doc/
-jars.extra.classpath = platform:/plugin/org.eclipse.mylyn.wikitext.core,\
- platform:/plugin/org.eclipse.mylyn.wikitext.core.ant,\
- platform:/plugin/org.eclipse.mylyn.wikitext.mediawiki.core
src.includes = about.html
diff --git a/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/build.xml
index 6841e8a..bf67631 100644
--- a/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/build.xml
@@ -6,18 +6,7 @@
<property name="document.title" value="Trace Compass Event Field Count User Guide" />
- <path id="wikitext.tasks.classpath">
- <!-- 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>
-
- <!-- For Maven builds: use the compile_classpath -->
- <pathelement path="${compile_classpath}" />
- </path>
-
- <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties" />
+ <taskdef resource="org/eclipse/mylyn/wikitext/ant/tasks.properties"/>
<target name="build" description="Generate Eclipse help content for the Trace Compass Incubator eventcount User Guide">
<wikitext-to-eclipse-help markupLanguage="MediaWiki"
diff --git a/doc/org.eclipse.tracecompass.incubator.filters.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch b/doc/org.eclipse.tracecompass.incubator.filters.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
deleted file mode 100644
index ea7968e..0000000
--- a/doc/org.eclipse.tracecompass.incubator.filters.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="build,build.index,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.tracecompass.incubator.filters.doc.user" type="4"/> </resources>}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.tracecompass.incubator.filters.doc.user/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<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.incubator.filters.doc.user"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tracecompass.incubator.filters.doc.user/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"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/doc/org.eclipse.tracecompass.incubator.filters.doc.user/.project b/doc/org.eclipse.tracecompass.incubator.filters.doc.user/.project
index d54526c..bd677b7 100644
--- a/doc/org.eclipse.tracecompass.incubator.filters.doc.user/.project
+++ b/doc/org.eclipse.tracecompass.incubator.filters.doc.user/.project
@@ -6,20 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>clean,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch</value>
- </dictionary>
- <dictionary>
- <key>incclean</key>
- <value>true</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -32,6 +18,5 @@
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.mylyn.wikitext.ui.wikiTextNature</nature>
</natures>
</projectDescription>
diff --git a/doc/org.eclipse.tracecompass.incubator.filters.doc.user/build.properties b/doc/org.eclipse.tracecompass.incubator.filters.doc.user/build.properties
index 04c1d52..647368c 100644
--- a/doc/org.eclipse.tracecompass.incubator.filters.doc.user/build.properties
+++ b/doc/org.eclipse.tracecompass.incubator.filters.doc.user/build.properties
@@ -13,8 +13,5 @@
plugin.properties,\
book.css,\
doc/
-jars.extra.classpath = platform:/plugin/org.eclipse.mylyn.wikitext.core,\
- platform:/plugin/org.eclipse.mylyn.wikitext.core.ant,\
- platform:/plugin/org.eclipse.mylyn.wikitext.mediawiki.core
src.includes = about.html
diff --git a/doc/org.eclipse.tracecompass.incubator.filters.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.filters.doc.user/build.xml
index 6f568ba..63b5a1d 100644
--- a/doc/org.eclipse.tracecompass.incubator.filters.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.filters.doc.user/build.xml
@@ -6,18 +6,7 @@
<property name="document.title" value="Trace Compass Filters User Guide" />
- <path id="wikitext.tasks.classpath">
- <!-- 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>
-
- <!-- For Maven builds: use the compile_classpath -->
- <pathelement path="${compile_classpath}" />
- </path>
-
- <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties" />
+ <taskdef resource="org/eclipse/mylyn/wikitext/ant/tasks.properties"/>
<target name="build" description="Generate Eclipse help content for the Trace Compass Incubator Filters User Guide">
<wikitext-to-eclipse-help markupLanguage="MediaWiki"
diff --git a/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch b/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
deleted file mode 100644
index 41b0677..0000000
--- a/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="build,build.index,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.tracecompass.incubator.ftrace.doc.user" type="4"/> </resources>}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.tracecompass.incubator.ftrace.doc.user/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<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.incubator.ftrace.doc.user"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tracecompass.incubator.ftrace.doc.user/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"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/.project b/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/.project
index 19aa82d..492efe6 100644
--- a/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/.project
+++ b/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/.project
@@ -6,20 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>clean,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch</value>
- </dictionary>
- <dictionary>
- <key>incclean</key>
- <value>true</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -32,6 +18,5 @@
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.mylyn.wikitext.ui.wikiTextNature</nature>
</natures>
</projectDescription>
diff --git a/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/build.properties b/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/build.properties
index cbb2af1..665daeb 100644
--- a/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/build.properties
+++ b/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/build.properties
@@ -13,8 +13,5 @@
plugin.properties,\
book.css,\
doc/
-jars.extra.classpath = platform:/plugin/org.eclipse.mylyn.wikitext.core,\
- platform:/plugin/org.eclipse.mylyn.wikitext.core.ant,\
- platform:/plugin/org.eclipse.mylyn.wikitext.mediawiki.core
src.includes = about.html
diff --git a/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/build.xml
index a7f4f7d..4496cff 100644
--- a/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/build.xml
@@ -6,18 +6,7 @@
<property name="document.title" value="Trace Compass ftrace User Guide" />
- <path id="wikitext.tasks.classpath">
- <!-- 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>
-
- <!-- For Maven builds: use the compile_classpath -->
- <pathelement path="${compile_classpath}" />
- </path>
-
- <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties" />
+ <taskdef resource="org/eclipse/mylyn/wikitext/ant/tasks.properties"/>
<target name="build" description="Generate Eclipse help content for the Trace Compass Incubator ftrace User Guide">
<wikitext-to-eclipse-help markupLanguage="MediaWiki"
diff --git a/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch b/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
deleted file mode 100644
index 27d3a19..0000000
--- a/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="build,build.index,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.tracecompass.incubator.kernel.doc.user" type="4"/> </resources>}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.tracecompass.incubator.kernel.doc.user/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<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.incubator.kernel.doc.user"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tracecompass.incubator.kernel.doc.user/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"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/.project b/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/.project
index e545b12..2a6aad4 100644
--- a/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/.project
+++ b/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/.project
@@ -6,20 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>clean,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch</value>
- </dictionary>
- <dictionary>
- <key>incclean</key>
- <value>true</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -32,6 +18,5 @@
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.mylyn.wikitext.ui.wikiTextNature</nature>
</natures>
</projectDescription>
diff --git a/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/build.properties b/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/build.properties
index af351ca..0089ffd 100644
--- a/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/build.properties
+++ b/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/build.properties
@@ -13,8 +13,5 @@
plugin.properties,\
book.css,\
doc/
-jars.extra.classpath = platform:/plugin/org.eclipse.mylyn.wikitext.core,\
- platform:/plugin/org.eclipse.mylyn.wikitext.core.ant,\
- platform:/plugin/org.eclipse.mylyn.wikitext.mediawiki.core
src.includes = about.html
diff --git a/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/build.xml
index 6ffd84b..6d5371f 100644
--- a/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/build.xml
@@ -6,18 +6,7 @@
<property name="document.title" value="Trace Compass kernel User Guide" />
- <path id="wikitext.tasks.classpath">
- <!-- 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>
-
- <!-- For Maven builds: use the compile_classpath -->
- <pathelement path="${compile_classpath}" />
- </path>
-
- <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties" />
+ <taskdef resource="org/eclipse/mylyn/wikitext/ant/tasks.properties"/>
<target name="build" description="Generate Eclipse help content for the Trace Compass Incubator kernel User Guide">
<wikitext-to-eclipse-help markupLanguage="MediaWiki"
diff --git a/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch b/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
deleted file mode 100644
index 69ce0d1..0000000
--- a/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="build,build.index,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user" type="4"/> </resources>}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<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.incubator.lttng2.ust.extras.doc.user"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/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"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/.project b/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/.project
index 1111406..5ed233e 100644
--- a/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/.project
+++ b/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/.project
@@ -6,20 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>clean,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch</value>
- </dictionary>
- <dictionary>
- <key>incclean</key>
- <value>true</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -32,6 +18,5 @@
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.mylyn.wikitext.ui.wikiTextNature</nature>
</natures>
</projectDescription>
diff --git a/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/build.properties b/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/build.properties
index 427057a..4e71c5b 100644
--- a/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/build.properties
+++ b/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/build.properties
@@ -13,8 +13,5 @@
plugin.properties,\
book.css,\
doc/
-jars.extra.classpath = platform:/plugin/org.eclipse.mylyn.wikitext.core,\
- platform:/plugin/org.eclipse.mylyn.wikitext.core.ant,\
- platform:/plugin/org.eclipse.mylyn.wikitext.mediawiki.core
src.includes = about.html
diff --git a/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/build.xml
index 2a7d0b6..53a5301 100644
--- a/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/build.xml
@@ -6,18 +6,7 @@
<property name="document.title" value="Trace Compass LTTng2 Ust Extras User Guide" />
- <path id="wikitext.tasks.classpath">
- <!-- 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>
-
- <!-- For Maven builds: use the compile_classpath -->
- <pathelement path="${compile_classpath}" />
- </path>
-
- <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties" />
+ <taskdef resource="org/eclipse/mylyn/wikitext/ant/tasks.properties"/>
<target name="build" description="Generate Eclipse help content for the Trace Compass Incubator LTTng2 Ust Extras User Guide">
<wikitext-to-eclipse-help markupLanguage="MediaWiki"
diff --git a/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch b/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
deleted file mode 100644
index 787997e..0000000
--- a/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="build,build.index,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.tracecompass.incubator.opentracing.doc.user" type="4"/> </resources>}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.tracecompass.incubator.opentracing.doc.user/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<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.incubator.opentracing.doc.user"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tracecompass.incubator.opentracing.doc.user/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"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/.project b/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/.project
index f4c3af5..9535d94 100644
--- a/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/.project
+++ b/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/.project
@@ -6,20 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>clean,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch</value>
- </dictionary>
- <dictionary>
- <key>incclean</key>
- <value>true</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -32,6 +18,5 @@
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.mylyn.wikitext.ui.wikiTextNature</nature>
</natures>
</projectDescription>
diff --git a/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/build.properties b/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/build.properties
index af351ca..0089ffd 100644
--- a/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/build.properties
+++ b/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/build.properties
@@ -13,8 +13,5 @@
plugin.properties,\
book.css,\
doc/
-jars.extra.classpath = platform:/plugin/org.eclipse.mylyn.wikitext.core,\
- platform:/plugin/org.eclipse.mylyn.wikitext.core.ant,\
- platform:/plugin/org.eclipse.mylyn.wikitext.mediawiki.core
src.includes = about.html
diff --git a/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/build.xml
index aabdc80..f0a030f 100644
--- a/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/build.xml
@@ -6,18 +6,7 @@
<property name="document.title" value="Trace Compass opentracing User Guide" />
- <path id="wikitext.tasks.classpath">
- <!-- 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>
-
- <!-- For Maven builds: use the compile_classpath -->
- <pathelement path="${compile_classpath}" />
- </path>
-
- <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties" />
+ <taskdef resource="org/eclipse/mylyn/wikitext/ant/tasks.properties"/>
<target name="build" description="Generate Eclipse help content for the Trace Compass Incubator opentracing User Guide">
<wikitext-to-eclipse-help markupLanguage="MediaWiki"
diff --git a/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch b/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
deleted file mode 100644
index de51a42..0000000
--- a/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="build,build.index,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.tracecompass.incubator.perf.profiling.doc.user" type="4"/> </resources>}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<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.incubator.perf.profiling.doc.user"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/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"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/.project b/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/.project
index 38ce115..3b3542d 100644
--- a/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/.project
+++ b/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/.project
@@ -6,20 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>clean,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch</value>
- </dictionary>
- <dictionary>
- <key>incclean</key>
- <value>true</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -32,6 +18,5 @@
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.mylyn.wikitext.ui.wikiTextNature</nature>
</natures>
</projectDescription>
diff --git a/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/build.properties b/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/build.properties
index 427057a..4e71c5b 100644
--- a/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/build.properties
+++ b/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/build.properties
@@ -13,8 +13,5 @@
plugin.properties,\
book.css,\
doc/
-jars.extra.classpath = platform:/plugin/org.eclipse.mylyn.wikitext.core,\
- platform:/plugin/org.eclipse.mylyn.wikitext.core.ant,\
- platform:/plugin/org.eclipse.mylyn.wikitext.mediawiki.core
src.includes = about.html
diff --git a/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/build.xml
index 91b8d7a..0d8bf10 100644
--- a/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/build.xml
@@ -6,18 +6,7 @@
<property name="document.title" value="Trace Compass Perf Profiling User Guide" />
- <path id="wikitext.tasks.classpath">
- <!-- 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>
-
- <!-- For Maven builds: use the compile_classpath -->
- <pathelement path="${compile_classpath}" />
- </path>
-
- <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties" />
+ <taskdef resource="org/eclipse/mylyn/wikitext/ant/tasks.properties"/>
<target name="build" description="Generate Eclipse help content for the Trace Compass Incubator Perf Profiling User Guide">
<wikitext-to-eclipse-help markupLanguage="MediaWiki"
diff --git a/doc/org.eclipse.tracecompass.incubator.ros.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch b/doc/org.eclipse.tracecompass.incubator.ros.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
deleted file mode 100644
index e9c6b3a..0000000
--- a/doc/org.eclipse.tracecompass.incubator.ros.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="build,build.index,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.tracecompass.incubator.ros.doc.user" type="4"/> </resources>}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.tracecompass.incubator.ros.doc.user/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<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.incubator.ros.doc.user"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tracecompass.incubator.ros.doc.user/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"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/doc/org.eclipse.tracecompass.incubator.ros.doc.user/.project b/doc/org.eclipse.tracecompass.incubator.ros.doc.user/.project
index 4bc63c8..719d21f 100644
--- a/doc/org.eclipse.tracecompass.incubator.ros.doc.user/.project
+++ b/doc/org.eclipse.tracecompass.incubator.ros.doc.user/.project
@@ -6,20 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>clean,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch</value>
- </dictionary>
- <dictionary>
- <key>incclean</key>
- <value>true</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -32,6 +18,5 @@
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.mylyn.wikitext.ui.wikiTextNature</nature>
</natures>
</projectDescription>
diff --git a/doc/org.eclipse.tracecompass.incubator.ros.doc.user/build.properties b/doc/org.eclipse.tracecompass.incubator.ros.doc.user/build.properties
index fe70d27..3744b73 100644
--- a/doc/org.eclipse.tracecompass.incubator.ros.doc.user/build.properties
+++ b/doc/org.eclipse.tracecompass.incubator.ros.doc.user/build.properties
@@ -13,8 +13,5 @@
plugin.properties,\
book.css,\
doc/
-jars.extra.classpath = platform:/plugin/org.eclipse.mylyn.wikitext.core,\
- platform:/plugin/org.eclipse.mylyn.wikitext.core.ant,\
- platform:/plugin/org.eclipse.mylyn.wikitext.mediawiki.core
src.includes = about.html
diff --git a/doc/org.eclipse.tracecompass.incubator.ros.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.ros.doc.user/build.xml
index a2b9130..42becc6 100644
--- a/doc/org.eclipse.tracecompass.incubator.ros.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.ros.doc.user/build.xml
@@ -6,18 +6,7 @@
<property name="document.title" value="Trace Compass ROS User Guide" />
- <path id="wikitext.tasks.classpath">
- <!-- 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>
-
- <!-- For Maven builds: use the compile_classpath -->
- <pathelement path="${compile_classpath}" />
- </path>
-
- <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties" />
+ <taskdef resource="org/eclipse/mylyn/wikitext/ant/tasks.properties"/>
<target name="build" description="Generate Eclipse help content for the Trace Compass Incubator ROS User Guide">
<wikitext-to-eclipse-help markupLanguage="MediaWiki"
diff --git a/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch b/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
deleted file mode 100644
index f75ede0..0000000
--- a/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="build,build.index,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.tracecompass.incubator.scripting.doc.user" type="4"/> </resources>}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.tracecompass.incubator.scripting.doc.user/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<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.incubator.scripting.doc.user"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tracecompass.incubator.scripting.doc.user/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"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/.project b/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/.project
index f53e084..fa9d572 100644
--- a/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/.project
+++ b/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/.project
@@ -6,20 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>clean,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch</value>
- </dictionary>
- <dictionary>
- <key>incclean</key>
- <value>true</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -32,6 +18,5 @@
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.mylyn.wikitext.ui.wikiTextNature</nature>
</natures>
</projectDescription>
diff --git a/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/build.properties b/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/build.properties
index 7b1596a..3d4e4c7 100644
--- a/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/build.properties
+++ b/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/build.properties
@@ -13,8 +13,5 @@
plugin.properties,\
book.css,\
doc/
-jars.extra.classpath = platform:/plugin/org.eclipse.mylyn.wikitext.core,\
- platform:/plugin/org.eclipse.mylyn.wikitext.core.ant,\
- platform:/plugin/org.eclipse.mylyn.wikitext.mediawiki.core
src.includes = about.html
diff --git a/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/build.xml
index 557c022..6786e1a 100644
--- a/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/build.xml
@@ -6,18 +6,7 @@
<property name="document.title" value="Trace Compass Scripting User Guide" />
- <path id="wikitext.tasks.classpath">
- <!-- 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>
-
- <!-- For Maven builds: use the compile_classpath -->
- <pathelement path="${compile_classpath}" />
- </path>
-
- <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties" />
+ <taskdef resource="org/eclipse/mylyn/wikitext/ant/tasks.properties"/>
<target name="build" description="Generate Eclipse help content for the Trace Compass Incubator Scripting User Guide">
<wikitext-to-eclipse-help markupLanguage="MediaWiki"
diff --git a/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/.externalToolBuilders/Trace Compass Incubator Developer Guide Builder.launch b/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/.externalToolBuilders/Trace Compass Incubator Developer Guide Builder.launch
deleted file mode 100644
index 148e37e..0000000
--- a/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/.externalToolBuilders/Trace Compass Incubator Developer Guide Builder.launch
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="build,build.index,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.tracecompass.incubator.trace.server.doc.dev" type="4"/> </resources>}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.tracecompass.incubator.trace.server.doc.dev/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<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.incubator.trace.server.doc.dev"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tracecompass.incubator.trace.server.doc.dev/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"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/.project b/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/.project
index 9d7748a..d835a75 100644
--- a/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/.project
+++ b/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/.project
@@ -6,20 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>clean,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/Trace Compass Incubator Developer Guide Builder.launch</value>
- </dictionary>
- <dictionary>
- <key>incclean</key>
- <value>true</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -32,6 +18,5 @@
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.mylyn.wikitext.ui.wikiTextNature</nature>
</natures>
</projectDescription>
diff --git a/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/build.properties b/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/build.properties
index 427057a..4e71c5b 100644
--- a/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/build.properties
+++ b/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/build.properties
@@ -13,8 +13,5 @@
plugin.properties,\
book.css,\
doc/
-jars.extra.classpath = platform:/plugin/org.eclipse.mylyn.wikitext.core,\
- platform:/plugin/org.eclipse.mylyn.wikitext.core.ant,\
- platform:/plugin/org.eclipse.mylyn.wikitext.mediawiki.core
src.includes = about.html
diff --git a/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/build.xml b/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/build.xml
index ecc9f6d..c701d6c 100644
--- a/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/build.xml
@@ -6,18 +6,7 @@
<property name="document.title" value="Trace Compass Trace Server Developer Guide" />
- <path id="wikitext.tasks.classpath">
- <!-- 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>
-
- <!-- For Maven builds: use the compile_classpath -->
- <pathelement path="${compile_classpath}" />
- </path>
-
- <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties" />
+ <taskdef resource="org/eclipse/mylyn/wikitext/ant/tasks.properties"/>
<target name="build" description="Generate Eclipse help content for the Trace Compass Incubator Trace Server Developer Guide">
<wikitext-to-eclipse-help markupLanguage="MediaWiki"
diff --git a/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch b/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
deleted file mode 100644
index e4c203b..0000000
--- a/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="build,build.index,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.tracecompass.incubator.uftrace.doc.user" type="4"/> </resources>}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.tracecompass.incubator.uftrace..doc.user/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<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.incubator.uftrace.doc.user"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tracecompass.incubator.uftrace.doc.user/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"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/.project b/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/.project
index a5495b5..26cfa03 100644
--- a/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/.project
+++ b/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/.project
@@ -6,20 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>clean,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch</value>
- </dictionary>
- <dictionary>
- <key>incclean</key>
- <value>true</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -32,6 +18,5 @@
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.mylyn.wikitext.ui.wikiTextNature</nature>
</natures>
</projectDescription>
diff --git a/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/build.properties b/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/build.properties
index 035f619..ce1913b 100644
--- a/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/build.properties
+++ b/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/build.properties
@@ -13,8 +13,5 @@
plugin.properties,\
book.css,\
doc/
-jars.extra.classpath = platform:/plugin/org.eclipse.mylyn.wikitext.core,\
- platform:/plugin/org.eclipse.mylyn.wikitext.core.ant,\
- platform:/plugin/org.eclipse.mylyn.wikitext.mediawiki.core
src.includes = about.html
diff --git a/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/build.xml
index 96c01f1..73cceef 100644
--- a/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/build.xml
@@ -6,18 +6,7 @@
<property name="document.title" value="Trace Compass uftrace User Guide" />
- <path id="wikitext.tasks.classpath">
- <!-- 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>
-
- <!-- For Maven builds: use the compile_classpath -->
- <pathelement path="${compile_classpath}" />
- </path>
-
- <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties" />
+ <taskdef resource="org/eclipse/mylyn/wikitext/ant/tasks.properties"/>
<target name="build" description="Generate Eclipse help content for the Trace Compass Incubator uftrace User Guide">
<wikitext-to-eclipse-help markupLanguage="MediaWiki"
diff --git a/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch b/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
deleted file mode 100644
index 7cacf42..0000000
--- a/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="build,build.index,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user" type="4"/> </resources>}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<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.incubator.virtual.machine.analysis.doc.user"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/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"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/.project b/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/.project
index c6f292b..8ab52ed 100644
--- a/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/.project
+++ b/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/.project
@@ -6,20 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>clean,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch</value>
- </dictionary>
- <dictionary>
- <key>incclean</key>
- <value>true</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -32,6 +18,5 @@
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.mylyn.wikitext.ui.wikiTextNature</nature>
</natures>
</projectDescription>
diff --git a/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/build.properties b/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/build.properties
index e898e88..5268f91 100644
--- a/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/build.properties
+++ b/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/build.properties
@@ -13,8 +13,5 @@
plugin.properties,\
book.css,\
doc/
-jars.extra.classpath = platform:/plugin/org.eclipse.mylyn.wikitext.core,\
- platform:/plugin/org.eclipse.mylyn.wikitext.core.ant,\
- platform:/plugin/org.eclipse.mylyn.wikitext.mediawiki.core
src.includes = about.html
diff --git a/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/build.xml
index 4180f55..7f61404 100644
--- a/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/build.xml
@@ -6,18 +6,7 @@
<property name="document.title" value="Trace Compass Virtual Machine Analysis User Guide" />
- <path id="wikitext.tasks.classpath">
- <!-- 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>
-
- <!-- For Maven builds: use the compile_classpath -->
- <pathelement path="${compile_classpath}" />
- </path>
-
- <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties" />
+ <taskdef resource="org/eclipse/mylyn/wikitext/ant/tasks.properties"/>
<target name="build" description="Generate Eclipse help content for the Trace Compass Incubator Virtual Machine Analysis User Guide">
<wikitext-to-eclipse-help markupLanguage="MediaWiki"
diff --git a/doc/pom.xml b/doc/pom.xml
index e88b931..db35731 100644
--- a/doc/pom.xml
+++ b/doc/pom.xml
@@ -26,6 +26,8 @@
<properties>
<docDestination>/home/data/httpd/archive.eclipse.org/tracecompass.incubator/doc</docDestination>
+ <wikitext.version>3.0.7</wikitext.version>
+ <guava.version>21.0</guava.version>
</properties>
<modules>
@@ -47,4 +49,35 @@
<!-- insert modules here -->
</modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.mylyn.docs</groupId>
+ <artifactId>org.eclipse.mylyn.wikitext</artifactId>
+ <version>${wikitext.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.mylyn.docs</groupId>
+ <artifactId>org.eclipse.mylyn.wikitext.ant</artifactId>
+ <version>${wikitext.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.mylyn.docs</groupId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
+ <version>${wikitext.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/skeleton/skeleton.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch b/skeleton/skeleton.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
deleted file mode 100644
index 837f87e..0000000
--- a/skeleton/skeleton.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="build,build.index,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.tracecompass.incubator.{%skeleton}.doc.user" type="4"/> </resources>}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.tracecompass.incubator.{%skeleton}.doc.user/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<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.incubator.{%skeleton}.doc.user"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tracecompass.incubator.{%skeleton}.doc.user/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"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/skeleton/skeleton.doc.user/.project.skel b/skeleton/skeleton.doc.user/.project.skel
index 81e5055..e7e3962 100644
--- a/skeleton/skeleton.doc.user/.project.skel
+++ b/skeleton/skeleton.doc.user/.project.skel
@@ -6,20 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>clean,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch</value>
- </dictionary>
- <dictionary>
- <key>incclean</key>
- <value>true</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -32,6 +18,5 @@
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.mylyn.wikitext.ui.wikiTextNature</nature>
</natures>
</projectDescription>
diff --git a/skeleton/skeleton.doc.user/build.properties b/skeleton/skeleton.doc.user/build.properties
index 025848f..7bf7830 100644
--- a/skeleton/skeleton.doc.user/build.properties
+++ b/skeleton/skeleton.doc.user/build.properties
@@ -13,8 +13,5 @@
plugin.properties,\
book.css,\
doc/
-jars.extra.classpath = platform:/plugin/org.eclipse.mylyn.wikitext.core,\
- platform:/plugin/org.eclipse.mylyn.wikitext.core.ant,\
- platform:/plugin/org.eclipse.mylyn.wikitext.mediawiki.core
src.includes = about.html
diff --git a/skeleton/skeleton.doc.user/build.xml b/skeleton/skeleton.doc.user/build.xml
index a85b9b4..547b6e8 100644
--- a/skeleton/skeleton.doc.user/build.xml
+++ b/skeleton/skeleton.doc.user/build.xml
@@ -6,18 +6,7 @@
<property name="document.title" value="Trace Compass {%skeletonName} User Guide" />
- <path id="wikitext.tasks.classpath">
- <!-- 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>
-
- <!-- For Maven builds: use the compile_classpath -->
- <pathelement path="${compile_classpath}" />
- </path>
-
- <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties" />
+ <taskdef resource="org/eclipse/mylyn/wikitext/ant/tasks.properties"/>
<target name="build" description="Generate Eclipse help content for the Trace Compass Incubator {%skeletonName} User Guide">
<wikitext-to-eclipse-help markupLanguage="MediaWiki"
