Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Green2015-07-06 17:55:12 -0400
committerDavid Green2015-07-06 18:35:21 -0400
commit4afe3ab740a245747cb08ef3606543f17571dd02 (patch)
tree65c395aa3a954cc8910f42d28eaa0e269af70025
parent09bfc5bc1c7534b29d5fc60bfee2e887f328ccd6 (diff)
downloadorg.eclipse.mylyn.tasks-4afe3ab740a245747cb08ef3606543f17571dd02.tar.gz
org.eclipse.mylyn.tasks-4afe3ab740a245747cb08ef3606543f17571dd02.tar.xz
org.eclipse.mylyn.tasks-4afe3ab740a245747cb08ef3606543f17571dd02.zip
471965: update mediawiki-to-eclipse-help taskdef
Change-Id: I926fbd8dd4d361fa3148b92f2667dda7d806f72a Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=471965
-rw-r--r--org.eclipse.mylyn.help.ui/build-helper.xml8
-rw-r--r--org.eclipse.mylyn.help.ui/pom.xml21
2 files changed, 1 insertions, 28 deletions
diff --git a/org.eclipse.mylyn.help.ui/build-helper.xml b/org.eclipse.mylyn.help.ui/build-helper.xml
index 7ec44834f..7207806bb 100644
--- a/org.eclipse.mylyn.help.ui/build-helper.xml
+++ b/org.eclipse.mylyn.help.ui/build-helper.xml
@@ -20,12 +20,6 @@
<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.docs/org.eclipse.mylyn.wikitext.core/@dot"/>
<pathelement location="../../org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.core/bin"/>
@@ -36,7 +30,7 @@
<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/mediawiki/core/ant/tasks.properties"/>
<taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties"/>
<target name="init">
diff --git a/org.eclipse.mylyn.help.ui/pom.xml b/org.eclipse.mylyn.help.ui/pom.xml
index a48de18f9..0b16738fc 100644
--- a/org.eclipse.mylyn.help.ui/pom.xml
+++ b/org.eclipse.mylyn.help.ui/pom.xml
@@ -13,27 +13,6 @@
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <configuration>
- <target>
- <property name="wikitext.tasks.classpath.path" refid="maven.compile.classpath"/>
- <ant target="all" inheritRefs="true" antfile="build-helper.xml"/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>

Back to the top