summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2007-04-23 13:38:17 (EDT)
committerpelder2007-04-23 13:38:17 (EDT)
commitd8ee2f5a355949fcc83e5795b4830e74f503772d (patch)
treee12a652f30d54e59604d7bb36d88166a879042aa
parent04ccbd3a4582b0e3db55c79b038b1dd049bc6309 (diff)
downloadorg.eclipse.jet-d8ee2f5a355949fcc83e5795b4830e74f503772d.zip
org.eclipse.jet-d8ee2f5a355949fcc83e5795b4830e74f503772d.tar.gz
org.eclipse.jet-d8ee2f5a355949fcc83e5795b4830e74f503772d.tar.bz2
[181212] migrate from emft to m2t, incorporate latest build templates.
-rw-r--r--doc/org.eclipse.jet.doc/build/antJavadoc.sh4
-rw-r--r--doc/org.eclipse.jet.doc/build/javadoc.xml.template39
2 files changed, 19 insertions, 24 deletions
diff --git a/doc/org.eclipse.jet.doc/build/antJavadoc.sh b/doc/org.eclipse.jet.doc/build/antJavadoc.sh
index 7d56c32..1cc0a2f 100644
--- a/doc/org.eclipse.jet.doc/build/antJavadoc.sh
+++ b/doc/org.eclipse.jet.doc/build/antJavadoc.sh
@@ -6,7 +6,7 @@
pluginName="org.eclipse.jet";
# string labels for javadoc content
-windowTitle="EMFT JET Javadoc";
+windowTitle="JET Javadoc";
groupTitle="JET";
# files to exclude from javadoc process - use Ant syntax
@@ -141,4 +141,4 @@ for packSum in `find $destDir -name "package-summary.html" | sort`; do
echo ' <topic label="'$label'" href="references/javadoc/'$path'/package-summary.html" />' >> $trXML;
done
echo ' </topic>' >> $trXML;
-echo '</toc>' >> $trXML;
+echo '</toc>' >> $trXML; \ No newline at end of file
diff --git a/doc/org.eclipse.jet.doc/build/javadoc.xml.template b/doc/org.eclipse.jet.doc/build/javadoc.xml.template
index da781c5..7eadaf1 100644
--- a/doc/org.eclipse.jet.doc/build/javadoc.xml.template
+++ b/doc/org.eclipse.jet.doc/build/javadoc.xml.template
@@ -13,26 +13,26 @@
<property environment="env"/>
<property name="javaHome" value="${env.JAVA_HOME}"/>
- <property name="javaHome1.4" value="${env.JAVA_HOME_1_4}"/>
<property name="javadoc.link.location" value="${eclipseDir}/javadoc"/>
<available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
- <target name="extractPlatformJavadoc" unless="platformJavadocExists">
- <unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv.jar" dest="${javadoc.link.location}/platform/"/>
- </target>
+ <!-- TODO Enable linking to the platform javadoc -->
+ <!-- <target name="extractPlatformJavadoc" unless="platformJavadocExists">
+ <exec executable="find">
+ <arg value="${eclipseDir}/.."/>
+ <arg value="-type"/>
+ <arg value="d"/>
+ <arg value="-name"/>
+ <arg value="javadoc"/>
+ </exec>
+ <unzip src="${eclipseDir}/@docjar@" dest="${javadoc.link.location}/platform/"/>
+ </target> -->
- <target name="javadoc" depends="extractPlatformJavadoc">
-<!-- temporarily remove indexing doclet
- <echo message="Get Doclet and compile it with JDK1.4 for use with javadoc"/>
- <cvs cvsRoot=":pserver:anonymous@dev.eclipse.org:/cvsroot/tools"
- package="org.eclipse.emf.releng.build/org.eclipse.emf.build"
- reallyquiet="yes"/>
- <delete dir="org.eclipse.emf.releng.build/org.eclipse.emf.build/src/CVS"/>
- <move todir="."><fileset dir="org.eclipse.emf.releng.build/org.eclipse.emf.build/src"/></move>
+ <!-- TODO Enable linking to the platform javadoc -->
+ <!-- <target name="javadoc" depends="extractPlatformJavadoc"> -->
- <javac srcdir="org/eclipse/emf/build/doclet" classpath=".:${java.home}/../lib/tools.jar" failonerror="true"/>
--->
+ <target name="javadoc">
<javadoc
destdir="${destDir}"
classpath="${classpath}"
@@ -57,15 +57,10 @@
use="true"
version="true">
<arg value="-J-Xmx256m"/>
-<!-- temporarily remove indexing doclet
- <doclet name="org.eclipse.emf.build.doclet.Doclet" path=".">
- <param name="-tocFilename" value="topics_Reference.xml"/>
- <param name="-tocRefPrefix" value="references/javadoc/"/>
- <param name="-tocTitle" value="API Reference"/>
- </doclet>
--->
+
<link offline="true" href="http://java.sun.com/j2se/1.4/docs/api/" packagelistLoc="${javaHome}/docs/api/"/>
- <link offline="true" href="/help/topic/org.eclipse.platform.doc.isv/reference/api/" packagelistLoc="${javadoc.link.location}/platform/reference/api/"/>
+ <!-- TODO Enable link to platform documentation -->
+ <!-- <link offline="true" href="/help/topic/org.eclipse.platform.doc.isv/reference/api/" packagelistLoc="${javadoc.link.location}/platform/reference/api/"/> -->
<tag name="ignore" description="ignore" enabled="false"/>
<tag name="generated" description="ignore" enabled="false"/>