summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2006-04-07 15:05:17 (EDT)
committer pelder2006-04-07 15:05:17 (EDT)
commitf5330c72c2c36e38c8f1dcbf6ed57f345abd7c6c (patch)
treeefba63a2dd03d3c1a6fc66259450263371135af6
parentee0c1c711d0db0022468e6f6a7506e58de4efebe (diff)
downloadorg.eclipse.jet-f5330c72c2c36e38c8f1dcbf6ed57f345abd7c6c.zip
org.eclipse.jet-f5330c72c2c36e38c8f1dcbf6ed57f345abd7c6c.tar.gz
org.eclipse.jet-f5330c72c2c36e38c8f1dcbf6ed57f345abd7c6c.tar.bz2
Yet another try at getting java doc to work
-rw-r--r--doc/org.eclipse.jet.doc/build/antJavadoc.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/org.eclipse.jet.doc/build/antJavadoc.sh b/doc/org.eclipse.jet.doc/build/antJavadoc.sh
index be7be84..f9bf861 100644
--- a/doc/org.eclipse.jet.doc/build/antJavadoc.sh
+++ b/doc/org.eclipse.jet.doc/build/antJavadoc.sh
@@ -28,10 +28,10 @@ function groupPackage
plugin=$1
hasToken=`grep "@plugin@" $currentPath/javadoc.xml.template`
if [ "x$hasToken" != "x" ]; then
- srcDir=$currentPath/../../$plugin/src
+ srcDir=$currentPath/../../plugins/$plugin/src
if [ -d "$srcDir" ]; then
packages=`find $srcDir -type f -name '*.java' -exec grep -e '^package .*;' {} \; | sed -e 's/^package *\(.*\);/\1/' | sed -e 's/[ ]*//g' | sort | uniq | xargs | sed -e 's/ /:/g'`
- packages=`echo $packages | sed -e 's/\//\\\\\\//g' | sed -e 's/\./\\\\\./g' | grep -F --invert-match -e '.internal'`
+ packages=`echo $packages | sed -e 's/\//\\\\\\//g' | sed -e 's/\./\\\\\./g'`
sed -e "s/\@plugin\@/${packages}/g" $currentPath/javadoc.xml.template > $currentPath/javadoc.xml.template.tmp
fi
@@ -44,7 +44,7 @@ groupPackage $pluginName
# Original: pluginDirs=`find $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | grep org.eclipse.emf.transaction | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
# New (eclipseDir): pluginDirs=`find $eclipseDir/plugins -name 'org.eclipse.emf.transaction*' -maxdepth 1 -type d -printf '%T@ %p\n' | sort -n | cut -f2 -d' '`
# Finds plugins in the Workspace:
-pluginDirs=`find $currentPath/../.. -maxdepth 1 -name "${pluginName}*" -type d -printf '%T@ %p\n' | sort -n | cut -f2 -d' '`
+pluginDirs=`find $currentPath/../../plugins -maxdepth 1 -name "${pluginName}*" -type d -printf '%T@ %p\n' | sort -n | cut -f2 -d' '`
### TODO: missing emf/sdo/xsd plugins (?) in $eclipseDir - need to copy them over or reference source (?)
### so that all classes/packages (and thus @links) can be resolved
@@ -59,7 +59,7 @@ for pluginDir in $pluginDirs; do
pluginDir=`echo $pluginDir | sed -e 's/\/runtime$//g'`
srcDir=$pluginDir/src
if [ -d "$srcDir" ]; then
- packagesets=$packagesets"<packageset dir=\"$srcDir\"><exclude name=\"$srcDir/**/doc-files/**\"/></packageset>"
+ packagesets=$packagesets"<packageset dir=\"$srcDir\"><exclude name=\"$srcDir/**/doc-files/**\"/><exclude name=\"$srcDir/**/internal/**\"/></packageset>"
copydocfiles=$copydocfiles"<copyDocFiles pluginDir=\"$pluginDir\"/>"
fi
done
@@ -117,7 +117,7 @@ function groupPackage
plugin=$1
hasToken=`grep "@plugin@" $currentPath/javadoc.xml.template`
if [ "x$hasToken" != "x" ]; then
- srcDir=$currentPath/../../$plugin/src
+ srcDir=$currentPath/../../plugins/$plugin/src
if [ -d "$srcDir" ]; then
packages=`find $srcDir -type f -name '*.java' -exec grep -e '^package .*;' {} \; | sed -e 's/^package *\(.*\);/\1/' | sed -e 's/[ \n\t\r]*//g' | sort | uniq | xargs | sed -e 's/ /:/g'`
packages=`echo $packages | sed -e 's/\//\\\\\\//g' | sed -e 's/\./\\\\\./g'`