From 9edf519e72e491e476e9e5350407309698585d44 Mon Sep 17 00:00:00 2001
From: Steffen Pingel
Date: Tue, 30 Aug 2011 02:28:18 +0200
Subject: REOPENED - bug 355930: Missing image in help doc for "Integration
 with other tools" https://bugs.eclipse.org/bugs/show_bug.cgi?id=355930

---
 org.eclipse.mylyn.help.ui/.gitignore       |  1 +
 org.eclipse.mylyn.help.ui/build-helper.xml | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 org.eclipse.mylyn.help.ui/.gitignore

(limited to 'org.eclipse.mylyn.help.ui')

diff --git a/org.eclipse.mylyn.help.ui/.gitignore b/org.eclipse.mylyn.help.ui/.gitignore
new file mode 100644
index 000000000..ceeb05b41
--- /dev/null
+++ b/org.eclipse.mylyn.help.ui/.gitignore
@@ -0,0 +1 @@
+/tmp
diff --git a/org.eclipse.mylyn.help.ui/build-helper.xml b/org.eclipse.mylyn.help.ui/build-helper.xml
index a8a0c6465..077c4c3e0 100644
--- a/org.eclipse.mylyn.help.ui/build-helper.xml
+++ b/org.eclipse.mylyn.help.ui/build-helper.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2009 Tasktop Technologies and others.
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License v1.0
@@ -8,7 +9,6 @@
     Contributors:
          Tasktop Technologies - initial API and implementation
  -->
-
 <project name="org.eclipse.mylyn.help.ui" default="all">
     <description>
             Generate Eclipse help content for the Mylyn user guide
@@ -18,19 +18,20 @@
 	<property name="mylyn.wiki.url.base" value="${mylyn.help.doc.url.base}/Mylyn"/>
 	<property name="imageFolder" value="images"/>
 	
+	<!-- used by pom.xml, currently disabled due to lack of Tycho integration
 	<path id="wikitext.tasks.classpath">
 		<pathelement path="${wikitext.tasks.classpath.path}"/>
 	</path>
-	<!--
+	-->
+	
 	<path id="wikitext.tasks.classpath">
-		<pathelement location="../org.eclipse.mylyn.wikitext.core/@dot"/>
-		<pathelement location="../org.eclipse.mylyn.wikitext.core/bin"/>
-		<pathelement location="../org.eclipse.mylyn.wikitext.core/bin_ant"/>
-		<pathelement location="../org.eclipse.mylyn.wikitext.mediawiki.core/@dot"/>
-		<pathelement location="../org.eclipse.mylyn.wikitext.mediawiki.core/bin"/>
-		<pathelement location="../org.eclipse.mylyn.wikitext.mediawiki.core/bin_ant"/>
+		<pathelement location="../../org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.core/@dot"/>
+		<pathelement location="../../org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.core/bin"/>
+		<pathelement location="../../org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.core/bin_ant"/>
+		<pathelement location="../../org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.mediawiki.core/@dot"/>
+		<pathelement location="../../org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.mediawiki.core/bin"/>
+		<pathelement location="../../org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.mediawiki.core/bin_ant"/>
 	</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"/>
-- 
cgit v1.2.3