488408: fix incorrect ant package name and paths
This fixes the mediawiki-to-eclipse-help task, which was broken in
I3ec52e8344fc4620d68c737feea15ece28986e2b
Change-Id: Ia9bcabbc2d29c0c5658e38c5041fd68e2f2ef4bf
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=488408
Signed-off-by: Sam Davis <sam.davis@tasktop.com>
diff --git a/org.eclipse.mylyn.wikitext.core/scripts/buildWikiTextAntSupportJar.xml b/org.eclipse.mylyn.wikitext.core/scripts/buildWikiTextAntSupportJar.xml
index 218cc09..940669a 100644
--- a/org.eclipse.mylyn.wikitext.core/scripts/buildWikiTextAntSupportJar.xml
+++ b/org.eclipse.mylyn.wikitext.core/scripts/buildWikiTextAntSupportJar.xml
@@ -50,11 +50,11 @@
<include name="plugins/org.eclipse.mylyn.wikitext.core*.jar"/>
</fileset>
</classpath>
- <src path="src_ant/"/>
+ <src path="../org.eclipse.mylyn.wikitext.core.ant/src"/>
</javac>
<!-- copy the *.class files to the jar location -->
<copy todir="${destdir}" failonerror="true" overwrite="false">
- <fileset dir="src_ant/">
+ <fileset dir="../org.eclipse.mylyn.wikitext.core.ant/src">
<exclude name="**/*.java"/>
<exclude name="**/package.htm*"/>
</fileset>
diff --git a/org.eclipse.mylyn.wikitext.help.ui/build-helper.xml b/org.eclipse.mylyn.wikitext.help.ui/build-helper.xml
index 92af320..f0f1606 100644
--- a/org.eclipse.mylyn.wikitext.help.ui/build-helper.xml
+++ b/org.eclipse.mylyn.wikitext.help.ui/build-helper.xml
@@ -16,7 +16,7 @@
<path id="wikitext.ant.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.core.ant/bin"/>
<pathelement location="${wikitext.ui.textile.bin}"/>
</path>
diff --git a/org.eclipse.mylyn.wikitext.mediawiki.core.ant/src/org/eclipse/mylyn/wikitext/mediawiki/core/ant/tasks.properties b/org.eclipse.mylyn.wikitext.mediawiki.core.ant/src/org/eclipse/mylyn/wikitext/mediawiki/core/ant/tasks.properties
index 8a35073..1cd740d 100644
--- a/org.eclipse.mylyn.wikitext.mediawiki.core.ant/src/org/eclipse/mylyn/wikitext/mediawiki/core/ant/tasks.properties
+++ b/org.eclipse.mylyn.wikitext.mediawiki.core.ant/src/org/eclipse/mylyn/wikitext/mediawiki/core/ant/tasks.properties
@@ -8,5 +8,5 @@
# Contributors:
# Chris Aniszczyk - initial API and implementation
###############################################################################
-mediawiki-fetch-images=org.eclipse.mylyn.internal.wikitext.mediawiki.core.tasks.MediaWikiImageFetcher
-mediawiki-to-eclipse-help=org.eclipse.mylyn.internal.wikitext.mediawiki.core.tasks.WikiToDocTask
\ No newline at end of file
+mediawiki-fetch-images=org.eclipse.mylyn.internal.wikitext.mediawiki.core.ant.tasks.MediaWikiImageFetcher
+mediawiki-to-eclipse-help=org.eclipse.mylyn.internal.wikitext.mediawiki.core.ant.tasks.WikiToDocTask
