mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-12 19:45:22 +02:00
Fix bootclasspath used by javadoc to be j2se-1.4 even though the tool is 1.5
This commit is contained in:
parent
6e036071be
commit
8d2d1249fc
4 changed files with 9 additions and 5 deletions
|
@ -51,7 +51,7 @@
|
||||||
</path>
|
</path>
|
||||||
</pathconvert>
|
</pathconvert>
|
||||||
<echo level="info" message="Done computing classpath."/>
|
<echo level="info" message="Done computing classpath."/>
|
||||||
<echo level="debug" message="Bootclasspath is: ${bootclasspath}"/>
|
<echo level="info" message="Bootclasspath is: ${bootclasspath}"/>
|
||||||
<echo level="debug" message="Classpath is: ${javadoc.classpath}"/>
|
<echo level="debug" message="Classpath is: ${javadoc.classpath}"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
@ -109,7 +109,8 @@
|
||||||
</condition>
|
</condition>
|
||||||
|
|
||||||
<replaceregexp file="${basedir}/${optionsFile}" flags="g" match="(\r\n?|\n);" replace="${argsListDelimiter}" />
|
<replaceregexp file="${basedir}/${optionsFile}" flags="g" match="(\r\n?|\n);" replace="${argsListDelimiter}" />
|
||||||
<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}${argsListDelimiter}${javadoc.classpath}" />
|
<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}" />
|
||||||
|
<replace file="${basedir}/${optionsFile}" token="@cp@" value="${javadoc.classpath}" />
|
||||||
<replace file="${basedir}/${optionsFile}" token="@baseLocation@" value="${safeBaseLocation}" />
|
<replace file="${basedir}/${optionsFile}" token="@baseLocation@" value="${safeBaseLocation}" />
|
||||||
<replace file="${basedir}/${optionsFile}" token="@javadoc.link.location@" value="${javadoc.link.location}" />
|
<replace file="${basedir}/${optionsFile}" token="@javadoc.link.location@" value="${javadoc.link.location}" />
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,8 @@
|
||||||
-sourcepath "../org.eclipse.dstore.core/src
|
-sourcepath "../org.eclipse.dstore.core/src
|
||||||
;../org.eclipse.dstore.extra/src"
|
;../org.eclipse.dstore.extra/src"
|
||||||
-d reference/api
|
-d reference/api
|
||||||
-classpath @rt@
|
-bootclasspath @rt@
|
||||||
|
-classpath @cp@
|
||||||
-breakiterator
|
-breakiterator
|
||||||
-use
|
-use
|
||||||
-splitIndex
|
-splitIndex
|
||||||
|
|
|
@ -122,7 +122,8 @@
|
||||||
</condition>
|
</condition>
|
||||||
|
|
||||||
<replaceregexp file="${basedir}/${optionsFile}" flags="g" match="(\r\n?|\n);" replace="${argsListDelimiter}" />
|
<replaceregexp file="${basedir}/${optionsFile}" flags="g" match="(\r\n?|\n);" replace="${argsListDelimiter}" />
|
||||||
<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}${argsListDelimiter}${javadoc.classpath}" />
|
<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}" />
|
||||||
|
<replace file="${basedir}/${optionsFile}" token="@cp@" value="${javadoc.classpath}" />
|
||||||
<replace file="${basedir}/${optionsFile}" token="@baseLocation@" value="${safeBaseLocation}" />
|
<replace file="${basedir}/${optionsFile}" token="@baseLocation@" value="${safeBaseLocation}" />
|
||||||
<replace file="${basedir}/${optionsFile}" token="@javadoc.link.location@" value="${javadoc.link.location}" />
|
<replace file="${basedir}/${optionsFile}" token="@javadoc.link.location@" value="${javadoc.link.location}" />
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,8 @@
|
||||||
;../org.eclipse.rse.ui/subsystems
|
;../org.eclipse.rse.ui/subsystems
|
||||||
;../org.eclipse.rse.ui/systems"
|
;../org.eclipse.rse.ui/systems"
|
||||||
-d reference/api
|
-d reference/api
|
||||||
-classpath @rt@
|
-bootclasspath @rt@
|
||||||
|
-classpath @cp@
|
||||||
;../org.eclipse.dstore.core/@dot
|
;../org.eclipse.dstore.core/@dot
|
||||||
;../org.eclipse.dstore.core/bin
|
;../org.eclipse.dstore.core/bin
|
||||||
;../org.eclipse.dstore.extra/@dot
|
;../org.eclipse.dstore.extra/@dot
|
||||||
|
|
Loading…
Add table
Reference in a new issue