[77413] Changing doclet used for Javadoc.
diff --git a/doc/org.eclipse.uml2.doc/build/antJavadoc.sh b/doc/org.eclipse.uml2.doc/build/antJavadoc.sh
index c514936..eaceeb7 100644
--- a/doc/org.eclipse.uml2.doc/build/antJavadoc.sh
+++ b/doc/org.eclipse.uml2.doc/build/antJavadoc.sh
@@ -1,6 +1,9 @@
# The current direcotry
currentPath=$PWD
+# export JAVA_HOME=/opt/sun-java2-5.0
+export JAVA_HOME_1_4=/opt/ibm-java2-1.4
+
# The eclipse directory
eclipseDir=$1
@@ -8,7 +11,7 @@
destDir=$eclipseDir/plugins/org.eclipse.uml2.doc/references/javadoc
# Don't execute if the destination directory has files
-if [ -d $destDir ]; then
+if [ -d "$destDir" ]; then
exit
fi
@@ -55,17 +58,21 @@
for pluginDir in $pluginDirs; do
pluginDir=`echo $pluginDir | sed -e 's/\/runtime$//g'`
srcDir=$pluginDir/src
- if [ -d $srcDir ]; then
+ if [ -d "$srcDir" ]; then
packagesets=$packagesets"<packageset dir=\"$srcDir\">"
packagesets=$packagesets"<exclude name=\"**/impl/**\"/>"
packagesets=$packagesets"<exclude name=\"**/internal/**\"/>"
packagesets=$packagesets"</packageset>"
+ copydocfiles=$copydocfiles"<copyDocFiles pluginDir=\"$pluginDir\"/>"
fi
done
# Replaces the token @packagesets@ in the template by the actual value
packagesets=`echo $packagesets | sed -e 's/\//\\\\\\//g' | sed -e 's/\./\\\\\./g'`
sed -e "s/\@packagesets\@/${packagesets}/g" $currentPath/javadoc.xml.template > javadoc.xml
+# Replaces the token @copydocfiles@ in the template by the actual value
+copydocfiles=`echo $copydocfiles | sed -e 's/\//\\\\\\//g' | sed -e 's/\./\\\\\./g'`
+sed -e "s/\@copydocfiles\@/${copydocfiles}/g" $currentPath/javadoc.xml.template2 > javadoc.xml
# Executes the ant script
ant -f javadoc.xml \
diff --git a/doc/org.eclipse.uml2.doc/build/javadoc.xml.template b/doc/org.eclipse.uml2.doc/build/javadoc.xml.template
index 603a910..3dd008a 100644
--- a/doc/org.eclipse.uml2.doc/build/javadoc.xml.template
+++ b/doc/org.eclipse.uml2.doc/build/javadoc.xml.template
@@ -22,16 +22,15 @@
<target name="javadoc" depends="extractPlatformJavadoc,extractEMFJavadoc">
- <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>
+ <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>
- <!-- requires JDK1.4 for compilation -->
- <javac srcdir="org/eclipse/emf/build/doclet" classpath=".:${java.home}/../lib/tools.jar" failonerror="true"/>
-
+ <!-- requires JDK1.4 for compilation -->
+ <javac srcdir="org/eclipse/emf/build/doclet" classpath=".:${javaHome1.4}/lib/tools.jar" failonerror="true"/>
<javadoc
destdir="${destDir}"
classpath="${classpath}"
@@ -51,6 +50,7 @@
noindex="false"
nonavbar="false"
notree="false"
+ source="1.4"
splitindex="true"
use="true"
version="true">
@@ -90,5 +90,18 @@
@packagesets@
</javadoc>
+
+ <!-- make sure the doc-files are copied -->
+ <macrodef name="copyDocFiles">
+ <attribute name="pluginDir"/>
+ <sequential>
+ <copy todir="${destDir}" failonerror="false">
+ <fileset dir="@{pluginDir}/src" includes="**/doc-files/**"/>
+ </copy>
+ </sequential>
+ </macrodef>
+
+@copydocfiles@
+
</target>
</project>
