# HG changeset patch
# User Chris Cannam
# Date 1307634598 -3600
# Node ID 73401a15037b7648cf21e9cb754612f739ea6979
# Parent  6253d777aa12bb1235c1a6425478336b1c382235
Ensure package name is given to javadoc even when only one package prefix found (fixing #182); use tree overview file as index instead of frame-based index file for multi-package extractions

diff -r 6253d777aa12 -r 73401a15037b extra/soundsoftware/extract-javadoc.sh
--- a/extra/soundsoftware/extract-javadoc.sh	Mon Jun 06 13:34:19 2011 +0100
+++ b/extra/soundsoftware/extract-javadoc.sh	Thu Jun 09 16:49:58 2011 +0100
@@ -50,23 +50,31 @@
 		continue
 	    fi
 	    if [ "$prefix" != "$current_prefix" ]; then
+		echo "Package $package matches file path and has new prefix $prefix"
 		if [ -n "$current_packages" ]; then
 		    echo "Running Javadoc for packages $current_packages from prefix $current_prefix"
+		    echo "Command is: javadoc -sourcepath "$current_prefix" -d "$targetdir" -subpackages $current_packages"
 		    javadoc -sourcepath "$current_prefix" -d "$targetdir" -subpackages $current_packages
 		fi
 		current_prefix="$prefix"
-		current_packages=
+		current_packages="$package"
 	    else
+		echo "Package $package matches file path with same prefix as previous file"
 		current_packages="$current_packages $package"
 	    fi
 	done
 	prefix=${prefix:=$projectdir}
 	if [ -n "$current_packages" ]; then
 	    echo "Running Javadoc for packages $current_packages in prefix $current_prefix"
+  	    echo "Command is: javadoc -sourcepath "$current_prefix" -d "$targetdir" -subpackages $current_packages"
 	    javadoc -sourcepath "$current_prefix" -d "$targetdir" -subpackages $current_packages
 	fi
     )
 
+if [ -f "$targetdir"/overview-tree.html ]; then
+    cp "$targetdir"/overview-tree.html "$targetdir"/index.html
+fi
+
 # for exit code:
 [ -f "$targetdir/index.html" ]