[77413] Changing doclet used for Javadoc.
diff --git a/deprecated/doc/org.eclipse.uml2.doc/build/antJavadoc.sh b/deprecated/doc/org.eclipse.uml2.doc/build/antJavadoc.sh
index 7ebcdc4..ae8e5e2 100644
--- a/deprecated/doc/org.eclipse.uml2.doc/build/antJavadoc.sh
+++ b/deprecated/doc/org.eclipse.uml2.doc/build/antJavadoc.sh
@@ -11,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
@@ -57,21 +57,17 @@
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/deprecated/doc/org.eclipse.uml2.doc/build/javadoc.xml.template b/deprecated/doc/org.eclipse.uml2.doc/build/javadoc.xml.template
index 7e4f63a..8bafce7 100644
--- a/deprecated/doc/org.eclipse.uml2.doc/build/javadoc.xml.template
+++ b/deprecated/doc/org.eclipse.uml2.doc/build/javadoc.xml.template
@@ -88,18 +88,5 @@
@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>
diff --git a/doc/org.eclipse.uml2.doc/build/antJavadoc.sh b/doc/org.eclipse.uml2.doc/build/antJavadoc.sh
index eaceeb7..c904c52 100644
--- a/doc/org.eclipse.uml2.doc/build/antJavadoc.sh
+++ b/doc/org.eclipse.uml2.doc/build/antJavadoc.sh
@@ -11,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
@@ -58,21 +58,17 @@
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 3dd008a..8b4331e 100644
--- a/doc/org.eclipse.uml2.doc/build/javadoc.xml.template
+++ b/doc/org.eclipse.uml2.doc/build/javadoc.xml.template
@@ -22,12 +22,12 @@
<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=".:${javaHome1.4}/lib/tools.jar" failonerror="true"/>
@@ -90,18 +90,5 @@
@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>
