diff extra/soundsoftware/extract-docs.sh @ 226:5b028aef59a7 feature_20

Add a whitelisting mechanism for Doxyfile contents

--- a/extra/soundsoftware/extract-docs.sh	Tue Feb 15 16:59:12 2011 +0000
+++ b/extra/soundsoftware/extract-docs.sh	Thu Feb 17 15:48:39 2011 +0000
@@ -22,7 +22,7 @@
     *) progdir="$(pwd)/$progdir" ;;
 esac
 
-types="javadoc doxygen"
+types="doxygen javadoc" # Do Doxygen first (it can be used for Java too)
 
 for x in $types; do
     if [ ! -x "$progdir/extract-$x.sh" ]; then
@@ -89,8 +89,8 @@
 
 	rm -rf "$tmptargetdir" "$snapshotdir"
 
-	mkdir -m 770 "$tmptargetdir" || fail "Snapshot directory creation failed"
-	chown docgen.www-data "$tmptargetdir" || fail "Snapshot directory ownership change failed"
+	mkdir -m 770 "$tmptargetdir" || fail "Temporary target directory creation failed"
+	chown docgen.www-data "$tmptargetdir" || fail "Temporary target directory ownership change failed"
 
 	mkdir -m 770 "$snapshotdir" || fail "Snapshot directory creation failed"
 	chown docgen.www-data "$snapshotdir" || fail "Snapshot directory ownership change failed"
@@ -113,7 +113,9 @@
 	echo "Temporary dir is $tmpdir, temporary doc dir is $tmptargetdir, snapshot dir is $snapshotdir, eventual target is $targetdir"
 
 	for x in $types; do
-	    if ! sudo -u docgen "$progdir/extract-$x.sh" "$project" "$snapshotdir" "$tmptargetdir" >> "$logfile" 2>&1; then
+	    if sudo -u docgen "$progdir/extract-$x.sh" "$project" "$snapshotdir" "$tmptargetdir" >> "$logfile" 2>&1; then
+		break
+	    else
 		echo "Failed to extract via type $x"
 	    fi
 	done