Safer docgen in the presence of generics

Author: Emile Joubert

Makefile

@@ -34,7 +34,7 @@ ensure-deliverables: rabbit-vsn
 	file ${RELEASE_DIR}/${NAME_VSN}.msm
 
 ensure-prerequisites: rabbit-vsn
-	[ -f "/etc/debian_version" ] && dpkg -L htmldoc plotutils transfig graphviz docbook-utils || true > /dev/null
+	[ -f "/etc/debian_version" ] && dpkg -L htmldoc plotutils transfig graphviz docbook-utils xmlstarlet || true > /dev/null
 
 ensure-release-dir: rabbit-vsn
 	touch ${RELEASE_DIR}/

docs/api-guide.sh

@@ -8,7 +8,7 @@ NAMESPACES=$(cd $HTMLPATH; ls namespace-*.html | sed -e 's/namespace-\(.*\)\.htm
 FILES="./api-title-page.html $HTMLPATH/index.html"
 for n in $NAMESPACES
 do
-    FILES="$FILES $HTMLPATH/namespace-$n.html $(cd $XMLPATH; cat namespace-$n.xml | grep '<type name' | sed -e 's:.*name="\([^"]*\)".*:'$HTMLPATH'/type-\1.html:')"
+    FILES="$FILES $HTMLPATH/namespace-$n.html $(cd $XMLPATH; xmlstarlet sel -t -v "/namespace/typedoc/type/@name" namespace-$n.xml | sed -e 's:^\(.*\)$:'$HTMLPATH'/type-\1.html:')"
 done
 
 htmldoc -t pdf --bodyfont serif --book --fontsize 9.0 --color $FILES > api-guide.pdf