From 502334c40d6ef761b07373762fb9505823647e86 Mon Sep 17 00:00:00 2001
From: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Date: Tue, 3 Feb 2015 13:38:52 -0500
Subject: [PATCH] doc: Clean up the build.xml Ant files

* Remove the "download" targets. We do not store the doc on a
  wiki anymore.
* Remove the pre-Luna Mylyn task location
* Keep only one instance of some commonly-used files, directly
  under the doc/ directory.

Change-Id: Ibfad6aa2ba332ebb3aec2de255a93fea38d5b1f7
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/41031
Reviewed-by: Hudson CI
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
---
 .../.empty.dtd                                |  0
 .../build.xml                                 | 11 ++----
 .../.empty.dtd                                |  0
 .../build.xml                                 | 38 ++----------------
 .../.empty.dtd                                |  0
 .../build.xml                                 | 39 +++----------------
 .../.empty.dtd                                |  0
 .../build.xml                                 | 36 ++---------------
 .../.empty.dtd                                |  0
 .../build.xml                                 |  9 ++---
 10 files changed, 19 insertions(+), 114 deletions(-)
 rename doc/{org.eclipse.tracecompass.doc.dev => }/.empty.dtd (100%)
 delete mode 100644 doc/org.eclipse.tracecompass.doc.user/.empty.dtd
 delete mode 100644 doc/org.eclipse.tracecompass.gdbtrace.doc.user/.empty.dtd
 delete mode 100644 doc/org.eclipse.tracecompass.rcp.doc.user/.empty.dtd
 delete mode 100644 doc/org.eclipse.tracecompass.tmf.pcap.doc.user/.empty.dtd

diff --git a/doc/org.eclipse.tracecompass.doc.dev/.empty.dtd b/doc/.empty.dtd
similarity index 100%
rename from doc/org.eclipse.tracecompass.doc.dev/.empty.dtd
rename to doc/.empty.dtd
diff --git a/doc/org.eclipse.tracecompass.doc.dev/build.xml b/doc/org.eclipse.tracecompass.doc.dev/build.xml
index e5b928dd93..78b3bf84f5 100644
--- a/doc/org.eclipse.tracecompass.doc.dev/build.xml
+++ b/doc/org.eclipse.tracecompass.doc.dev/build.xml
@@ -4,7 +4,7 @@
         Generate Eclipse help content for the Trace Compass Developer Guide
     </description>
 
-   <property name="ug.title" value="Trace Compass Developer Guide" />
+    <property name="document.title" value="Trace Compass Developer Guide" />
 
     <path id="wikitext.tasks.classpath">
         <!-- Search in the local Eclipse plugins directory for the Wikitext plugin -->
@@ -17,19 +17,16 @@
         <pathelement path="${compile_classpath}" />
     </path>
 
-    <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/internal/wikitext/mediawiki/core/tasks/tasks.properties" />
-    <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/util/anttask/tasks.properties" />
-    <!-- Different location in more recent versions of Mylyn (Luna ?) -->
     <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties" />
 
-    <target name="build" description="Generate Eclipse help content for the Linux Tools TMF Developer Guide">
+    <target name="build" description="Generate Eclipse help content for the Trace Compass Developer Guide">
         <wikitext-to-eclipse-help markupLanguage="MediaWiki"
             validate="true"
             failonvalidationerror="true"
             overwrite="true"
             multipleOutputFiles="true"
             navigationimages="true"
-            title="${ug.title}"
+            title="${document.title}"
             formatoutput="true"
             helpPrefix="doc">
             <fileset dir="doc">
@@ -49,7 +46,7 @@
             <fileset dir="doc">
                 <include name="**/*.html" />
             </fileset>
-            <dtd publicid="-//W3C//DTD XHTML 1.0 Transitional//EN" location=".empty.dtd" />
+            <dtd publicid="-//W3C//DTD XHTML 1.0 Transitional//EN" location="../.empty.dtd" />
         </xmlvalidate>
     </target>
 
diff --git a/doc/org.eclipse.tracecompass.doc.user/.empty.dtd b/doc/org.eclipse.tracecompass.doc.user/.empty.dtd
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/doc/org.eclipse.tracecompass.doc.user/build.xml b/doc/org.eclipse.tracecompass.doc.user/build.xml
index 209c949d7c..f9271b3f5c 100644
--- a/doc/org.eclipse.tracecompass.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.doc.user/build.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="org.eclipse.tracecompass.doc.user" default="build">
     <description>
-            Generate Eclipse help content for the Trace Compass user guide
+            Generate Eclipse help content for the Trace Compass User Guide
     </description>
 
-    <!-- Set correct values -->
-    <property name="help.doc.url.base" value="http://wiki.eclipse.org" />
-    <property name="ug.path"  value="Linux_Tools_Project/LTTng2/User_Guide" />
-    <property name="ug.title" value="LTTng Plug-in User Guide" />
+    <property name="document.title" value="Trace Compass User Guide" />
 
     <path id="wikitext.tasks.classpath">
         <!-- Search in the local Eclipse plugins directory for the Wikitext plugin -->
@@ -20,9 +17,6 @@
         <pathelement path="${compile_classpath}" />
     </path>
 
-    <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/internal/wikitext/mediawiki/core/tasks/tasks.properties" />
-    <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/util/anttask/tasks.properties" />
-    <!-- Different location in more recent versions of Mylyn (Luna ?) -->
     <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties" />
 
     <target name="build" description="Generate Eclipse help content for the Trace Compass User Guide">
@@ -32,7 +26,7 @@
                 overwrite="true"
                 multipleOutputFiles="true"
                 navigationimages="true"
-                title="${ug.title}"
+                title="${document.title}"
                 formatoutput="true"
                 helpPrefix="doc">
                 <fileset dir="./doc">
@@ -52,38 +46,14 @@
             <fileset dir="doc">
                 <include name="**/*.html" />
             </fileset>
-            <dtd publicid="-//W3C//DTD XHTML 1.0 Transitional//EN" location=".empty.dtd" />
+            <dtd publicid="-//W3C//DTD XHTML 1.0 Transitional//EN" location="../.empty.dtd" />
         </xmlvalidate>
     </target>
 
-
-    <!-- If you need a proxy for the "download" target, set it here -->
-    <!--
-    <setproxy proxyhost="host" proxyport="port"/>
-    -->
-
-    <target name="download" description="Download the current contents of the Trace Compass User Guide from the Eclipse wiki">
-        <mediawiki-to-eclipse-help wikiBaseUrl="${help.doc.url.base}" title="${ug.title}" formatoutput="true" dest="." templateExcludes="*eclipseproject*">
-            <path name="${ug.path}" title="${ug.title}" generateToc="false" />
-            <stylesheet url="book.css" />
-            <pageAppendum>
-= Updating This Document =
-
-This document is maintained in a collaborative wiki.  If you wish to update or modify this document please visit
-http://wiki.eclipse.org/Linux_Tools_Project/LTTng2/User_Guide.
-            </pageAppendum>
-        </mediawiki-to-eclipse-help>
-    </target>
-
     <target name ="clean" description="Delete all generated files">
       <delete failonerror="false" includeemptydirs="true">
-        <!-- Files under doc/ (generated locally) -->
         <fileset dir="doc" includes="**/*.html" />
         <fileset dir="doc" includes="**/*.xml" />
-
-        <!-- Files downloaded from the Eclipse wiki -->
-        <fileset dir="Linux_Tools_Project" />
-        <fileset file="toc.xml" />
       </delete>
     </target>
 
diff --git a/doc/org.eclipse.tracecompass.gdbtrace.doc.user/.empty.dtd b/doc/org.eclipse.tracecompass.gdbtrace.doc.user/.empty.dtd
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/doc/org.eclipse.tracecompass.gdbtrace.doc.user/build.xml b/doc/org.eclipse.tracecompass.gdbtrace.doc.user/build.xml
index 16ede4faef..a2ad4bee67 100644
--- a/doc/org.eclipse.tracecompass.gdbtrace.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.gdbtrace.doc.user/build.xml
@@ -9,13 +9,10 @@
 -->
 <project name="org.eclipse.tracecompass.gdbtrace.doc.user" default="build">
     <description>
-            Generate Eclipse help content for the Trace Compass GDB Tracepoint Analysis user guide
+            Generate Eclipse help content for the Trace Compass GDB Tracepoint Analysis User Guide
     </description>
 
-    <!-- Set correct values -->
-    <property name="help.doc.url.base" value="http://wiki.eclipse.org" />
-    <property name="ug.path"  value="Linux_Tools_Project/GDB_Tracepoint_Analysis/User_Guide" />
-    <property name="ug.title" value="GDB Tracepoint Analysis User Guide" />
+    <property name="document.title" value="GDB Tracepoint Analysis User Guide" />
 
     <path id="wikitext.tasks.classpath">
         <!-- Search in the local Eclipse plugins directory for the Wikitext plugin -->
@@ -28,19 +25,16 @@
         <pathelement path="${compile_classpath}" />
     </path>
 
-    <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/internal/wikitext/mediawiki/core/tasks/tasks.properties" />
-    <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/util/anttask/tasks.properties" />
-    <!-- Different location in more recent versions of Mylyn (Luna ?) -->
     <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties" />
 
-    <target name="build" description="Generate Eclipse help content for the Linux Tools GDB Tracepoint Analysis User Guide">
+    <target name="build" description="Generate Eclipse help content for the Trace Compass GDB Tracepoint Analysis User Guide">
         <wikitext-to-eclipse-help markupLanguage="MediaWiki"
                 validate="true"
                 failonvalidationerror="true"
                 overwrite="true"
                 multipleOutputFiles="true"
                 navigationimages="true"
-                title="${ug.title}"
+                title="${document.title}"
                 formatoutput="true"
                 helpPrefix="doc">
                 <fileset dir="./doc">
@@ -60,37 +54,14 @@
             <fileset dir="doc">
                 <include name="**/*.html" />
             </fileset>
-            <dtd publicid="-//W3C//DTD XHTML 1.0 Transitional//EN" location=".empty.dtd" />
+            <dtd publicid="-//W3C//DTD XHTML 1.0 Transitional//EN" location="../.empty.dtd" />
         </xmlvalidate>
     </target>
 
-    <!-- If you need a proxy for the "download" target, set it here -->
-    <!--
-    <setproxy proxyhost="host" proxyport="port"/>
-    -->
-
-    <target name="download" description="Download the current contents of the GDB Tracepoint Analysis User Guide from the Eclipse wiki">
-        <mediawiki-to-eclipse-help wikiBaseUrl="${help.doc.url.base}" title="${ug.title}" formatoutput="true" dest="." templateExcludes="*eclipseproject*">
-            <path name="${ug.path}" title="${ug.title}" generateToc="false" />
-            <stylesheet url="book.css" />
-            <pageAppendum>
-= Updating This Document =
-
-This document is maintained in a collaborative wiki.  If you wish to update or modify this document please visit
-http://wiki.eclipse.org/Linux_Tools_Project/GDB_Tracepoint_Analysis/User_Guide.
-            </pageAppendum>
-        </mediawiki-to-eclipse-help>
-    </target>
-
     <target name ="clean" description="Delete all generated files">
       <delete failonerror="false" includeemptydirs="true">
-        <!-- Files under doc/ (generated locally) -->
         <fileset dir="doc" includes="**/*.html" />
         <fileset dir="doc" includes="**/*.xml" />
-
-        <!-- Files downloaded from the Eclipse wiki -->
-        <fileset dir="Linux_Tools_Project" />
-        <fileset file="toc.xml" />
       </delete>
     </target>
 
diff --git a/doc/org.eclipse.tracecompass.rcp.doc.user/.empty.dtd b/doc/org.eclipse.tracecompass.rcp.doc.user/.empty.dtd
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/doc/org.eclipse.tracecompass.rcp.doc.user/build.xml b/doc/org.eclipse.tracecompass.rcp.doc.user/build.xml
index 15c3f57190..d723850094 100644
--- a/doc/org.eclipse.tracecompass.rcp.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.rcp.doc.user/build.xml
@@ -4,10 +4,7 @@
             Generate Eclipse help content for the Trace Compass RCP user guide
     </description>
 
-    <!-- Set correct values -->
-    <property name="help.doc.url.base" value="http://wiki.eclipse.org" />
-    <property name="ug.path"  value="Linux_Tools_Project/Trace_Viewer/User_Guide" />
-    <property name="ug.title" value="Trace Compass RCP User Guide" />
+    <property name="document.title" value="Trace Compass RCP User Guide" />
 
     <path id="wikitext.tasks.classpath">
         <!-- Search in the local Eclipse plugins directory for the Wikitext plugin -->
@@ -20,9 +17,6 @@
         <pathelement path="${compile_classpath}" />
     </path>
 
-    <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/internal/wikitext/mediawiki/core/tasks/tasks.properties" />
-    <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/util/anttask/tasks.properties" />
-    <!-- Different location in more recent versions of Mylyn (Luna ?) -->
     <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties" />
 
     <target name="build" description="Generate Eclipse help content for the Trace Compass RCP User Guide">
@@ -32,7 +26,7 @@
                 overwrite="true"
                 multipleOutputFiles="true"
                 navigationimages="true"
-                title="${ug.title}"
+                title="${document.title}"
                 formatoutput="true"
                 helpPrefix="doc">
                 <fileset dir="./doc">
@@ -52,38 +46,14 @@
             <fileset dir="doc">
                 <include name="**/*.html" />
             </fileset>
-            <dtd publicid="-//W3C//DTD XHTML 1.0 Transitional//EN" location=".empty.dtd" />
+            <dtd publicid="-//W3C//DTD XHTML 1.0 Transitional//EN" location="../.empty.dtd" />
         </xmlvalidate>
     </target>
 
-
-    <!-- If you need a proxy for the "download" target, set it here -->
-    <!--
-    <setproxy proxyhost="host" proxyport="port"/>
-    -->
-
-    <target name="download" description="Download the current contents of the LTTng User Guide from the Eclipse wiki">
-        <mediawiki-to-eclipse-help wikiBaseUrl="${help.doc.url.base}" title="${ug.title}" formatoutput="true" dest="." templateExcludes="*eclipseproject*">
-            <path name="${ug.path}" title="${ug.title}" generateToc="false" />
-            <stylesheet url="book.css" />
-            <pageAppendum>
-= Updating This Document =
-
-This document is maintained in a collaborative wiki.  If you wish to update or modify this document please visit
-http://wiki.eclipse.org/Linux_Tools_Project/LTTng2/User_Guide.
-            </pageAppendum>
-        </mediawiki-to-eclipse-help>
-    </target>
-
     <target name ="clean" description="Delete all generated files">
       <delete failonerror="false" includeemptydirs="true">
-        <!-- Files under doc/ (generated locally) -->
         <fileset dir="doc" includes="**/*.html" />
         <fileset dir="doc" includes="**/*.xml" />
-
-        <!-- Files downloaded from the Eclipse wiki -->
-        <fileset dir="Linux_Tools_Project" />
-        <fileset file="toc.xml" />
       </delete>
     </target>
 
diff --git a/doc/org.eclipse.tracecompass.tmf.pcap.doc.user/.empty.dtd b/doc/org.eclipse.tracecompass.tmf.pcap.doc.user/.empty.dtd
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/doc/org.eclipse.tracecompass.tmf.pcap.doc.user/build.xml b/doc/org.eclipse.tracecompass.tmf.pcap.doc.user/build.xml
index 906fdf69d9..c56835a822 100644
--- a/doc/org.eclipse.tracecompass.tmf.pcap.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.tmf.pcap.doc.user/build.xml
@@ -4,7 +4,7 @@
         Generate Eclipse help content for the Trace Compass Pcap User Guide
     </description>
 
-   <property name="ug.title" value="Pcap Network Tracing User Guide" />
+   <property name="document.title" value="Pcap Network Tracing User Guide" />
 
     <path id="wikitext.tasks.classpath">
         <!-- Search in the local Eclipse plugins directory for the Wikitext plugin -->
@@ -17,9 +17,6 @@
         <pathelement path="${compile_classpath}" />
     </path>
 
-    <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/internal/wikitext/mediawiki/core/tasks/tasks.properties" />
-    <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/util/anttask/tasks.properties" />
-    <!-- Different location in more recent versions of Mylyn (Luna ?) -->
     <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties" />
 
     <target name="build" description="Generate Eclipse help content for the Trace Compass Pcap User Guide">
@@ -29,7 +26,7 @@
             overwrite="true"
             multipleOutputFiles="true"
             navigationimages="true"
-            title="${ug.title}"
+            title="${document.title}"
             formatoutput="true"
             helpPrefix="doc">
             <fileset dir="doc">
@@ -49,7 +46,7 @@
             <fileset dir="doc">
                 <include name="**/*.html" />
             </fileset>
-            <dtd publicid="-//W3C//DTD XHTML 1.0 Transitional//EN" location=".empty.dtd" />
+            <dtd publicid="-//W3C//DTD XHTML 1.0 Transitional//EN" location="../.empty.dtd" />
         </xmlvalidate>
     </target>
 
-- 
2.34.1