# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1297964774 0
# Node ID 3c084a25d8ab01af15ae644d7f0816f8c1c2240b
# Parent  5b028aef59a7447ece0dbcb4eb877ddcadf36a13
Make use of doxysafe

diff -r 5b028aef59a7 -r 3c084a25d8ab extra/soundsoftware/doxysafe.pl
--- a/extra/soundsoftware/doxysafe.pl	Thu Feb 17 15:48:39 2011 +0000
+++ b/extra/soundsoftware/doxysafe.pl	Thu Feb 17 17:46:14 2011 +0000
@@ -22,7 +22,7 @@
     PERL_PATH => "/usr/bin/perl",
     HAVE_DOT => "YES",
     HTML_OUTPUT => ".",
-    HTML_DYNAMIC_SECTIONS = "NO",
+    HTML_DYNAMIC_SECTIONS => "NO",
     SEARCHENGINE => "NO",
     DOT_FONTNAME => "FreeMono",
     DOT_FONTSIZE => 10,
@@ -200,5 +200,11 @@
     $settings{$key} = $value;
 }
 
+foreach my $key (keys %fixed) {
+    my $value = $fixed{$key};
+    print STDERR "NOTE: Setting $key to fixed value $value\n";
+    $settings{$key} = $value;
+}
+
 print join "\n", map { "$_ = $settings{$_}" } keys %settings;
 print "\n";
diff -r 5b028aef59a7 -r 3c084a25d8ab extra/soundsoftware/extract-docs.sh
--- a/extra/soundsoftware/extract-docs.sh	Thu Feb 17 15:48:39 2011 +0000
+++ b/extra/soundsoftware/extract-docs.sh	Thu Feb 17 17:46:14 2011 +0000
@@ -34,10 +34,14 @@
 enable_embedded()
 {
     p="$1"
-    if [ -n "$apiuser" ]; then
-	sudo -u docgen curl -u "$apiuser":"$apipass" "http://$apihost/sys/projects/$p/embedded.xml?enable=1&key=$apikey" -d ""
-    else
-	sudo -u docgen curl "http://$apihost/sys/projects/$p/embedded.xml?enable=1&key=$apikey" -d ""
+    if [ -n "$apikey" ]; then
+	if [ -n "$apiuser" ]; then
+	    sudo -u docgen curl -u "$apiuser":"$apipass" "http://$apihost/sys/projects/$p/embedded.xml?enable=1&key=$apikey" -d ""
+	else
+	    sudo -u docgen curl "http://$apihost/sys/projects/$p/embedded.xml?enable=1&key=$apikey" -d ""
+	fi
+    else 
+	echo "Can't enable Embedded, API not configured" 1>&2
     fi
 }
 
@@ -136,6 +140,8 @@
 		mv "$tmptargetdir" "$targetdir"
 		chgrp -R "$redgrp" "$targetdir"
 	    fi
+	else
+	    echo "Processing did not result in an index.html being created"
 	fi
     fi
 done
diff -r 5b028aef59a7 -r 3c084a25d8ab extra/soundsoftware/extract-doxygen.sh
--- a/extra/soundsoftware/extract-doxygen.sh	Thu Feb 17 15:48:39 2011 +0000
+++ b/extra/soundsoftware/extract-doxygen.sh	Thu Feb 17 17:46:14 2011 +0000
@@ -2,6 +2,12 @@
 
 docdir="/var/doc"
 
+progdir=$(dirname $0)
+case "$progdir" in
+    /*) ;;
+    *) progdir="$(pwd)/$progdir" ;;
+esac
+
 project="$1"
 projectdir="$2"
 targetdir="$3"
@@ -37,22 +43,7 @@
 
 cd "$projectdir" || exit 1
 
-# hmm. should be a whitelist
-
-cat "$doxyfile" | \
-    grep -vi OUTPUT_DIRECTORY | \
-    grep -vi HTML_OUTPUT | \
-    grep -vi SEARCHENGINE | \
-    grep -vi HAVE_DOT | \
-    grep -vi DOT_FONTNAME | \
-    grep -vi DOT_FONTPATH | \
-    grep -vi DOT_TRANSPARENT | \
-    sed -e '$a OUTPUT_DIRECTORY='"$targetdir" \
-    -e '$a HTML_OUTPUT = .' \
-    -e '$a SEARCHENGINE = NO' \
-    -e '$a HAVE_DOT = YES' \
-    -e '$a DOT_FONTNAME = FreeMono' \
-    -e '$a DOT_FONTPATH = /usr/share/fonts/truetype/freefont' \
-    -e '$a DOT_TRANSPARENT = YES' | \
+"$progdir/doxysafe.pl" "$doxyfile" | \
+    sed -e '$a OUTPUT_DIRECTORY='"$targetdir" | \
     doxygen -