# HG changeset patch
# User Chris Cannam
# Date 1310636587 -3600
# Node ID 107d36338b70fa961bd32f62189a5aee56216f9b
# Parent  a9f6345cb43d0ebbf1bb9c54b130eb69cbfd98c8# Parent  c1f5f029918010fcbaf33b19b7da53507d0cac4e
Merge from branch "cannam"

diff -r c1f5f0299180 -r 107d36338b70 extra/soundsoftware/extract-javadoc.sh
--- a/extra/soundsoftware/extract-javadoc.sh	Thu Jul 14 10:40:18 2011 +0100
+++ b/extra/soundsoftware/extract-javadoc.sh	Thu Jul 14 10:43:07 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" ]