Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Davis2016-03-15 18:30:50 +0000
committerSam Davis2016-03-15 18:30:50 +0000
commit555588a5f02f4b0716b995deb7c8c10ba84f6341 (patch)
tree3bc9d31e3aa995c4edd1a3d5a7dbc0e635019149
parentd7791d2db0b618bfcc946b73d80b7edd39b1e779 (diff)
downloadorg.eclipse.mylyn.tasks-555588a5f02f4b0716b995deb7c8c10ba84f6341.tar.gz
org.eclipse.mylyn.tasks-555588a5f02f4b0716b995deb7c8c10ba84f6341.tar.xz
org.eclipse.mylyn.tasks-555588a5f02f4b0716b995deb7c8c10ba84f6341.zip
488408: update classpath with correct location of mediawiki.core.ant
Change-Id: Ic56a01d32822ce6edf854edc8342a606c5fe53aa Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=488408
-rw-r--r--org.eclipse.mylyn.help.ui/build-helper.xml5
-rw-r--r--org.eclipse.mylyn.help.ui/org.eclipse.mylyn.help.ui build-helper.xml.launch2
2 files changed, 2 insertions, 5 deletions
diff --git a/org.eclipse.mylyn.help.ui/build-helper.xml b/org.eclipse.mylyn.help.ui/build-helper.xml
index 7207806bb..179b2e38d 100644
--- a/org.eclipse.mylyn.help.ui/build-helper.xml
+++ b/org.eclipse.mylyn.help.ui/build-helper.xml
@@ -21,13 +21,10 @@
<property name="imageFolder" value="images"/>
<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"/>
- <pathelement location="../../org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.core/bin_ant"/>
<pathelement location="../../org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.core.ant/bin"/>
- <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"/>
+ <pathelement location="../../org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.mediawiki.core.ant/bin"/>
</path>
<taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/mediawiki/core/ant/tasks.properties"/>
diff --git a/org.eclipse.mylyn.help.ui/org.eclipse.mylyn.help.ui build-helper.xml.launch b/org.eclipse.mylyn.help.ui/org.eclipse.mylyn.help.ui build-helper.xml.launch
index 835c66210..8bebd0f4b 100644
--- a/org.eclipse.mylyn.help.ui/org.eclipse.mylyn.help.ui build-helper.xml.launch
+++ b/org.eclipse.mylyn.help.ui/org.eclipse.mylyn.help.ui build-helper.xml.launch
@@ -15,7 +15,7 @@
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre6"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.mylyn.help.ui"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>

Back to the top