summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2010-10-16 18:00:31 +0000
committerIan Lynagh <igloo@earth.li>2010-10-16 18:00:31 +0000
commit64bb8c5165e41d3279e29ca5dceda6312128ea76 (patch)
treee788d2272ab89896c5fef27b150c575ea521a2f0
parentf93092f9c537cdeed37ad28a1e509d0d04459289 (diff)
downloadhaskell-64bb8c5165e41d3279e29ca5dceda6312128ea76.tar.gz
Only put the boot packages in the haddock contents/index
We don't install dph etc, so don't put them in the doc index.
-rw-r--r--libraries/gen_contents_index26
1 files changed, 12 insertions, 14 deletions
diff --git a/libraries/gen_contents_index b/libraries/gen_contents_index
index 1d8306416c..fcf30e3ce8 100644
--- a/libraries/gen_contents_index
+++ b/libraries/gen_contents_index
@@ -7,21 +7,19 @@ HADDOCK_ARGS=
case $* in
--inplace)
HADDOCK=../inplace/bin/haddock
- HADDOCK_FILES=`ls -1 */dist-install/doc/html/*/*.haddock | sort`
- if [ -d dph ]
- then
- DPH_HADDOCK_FILES=`ls -1 dph/*/dist-install/doc/html/*/*.haddock | sort`
- HADDOCK_FILES="$HADDOCK_FILES $DPH_HADDOCK_FILES"
- fi
- for HADDOCK_FILE in $HADDOCK_FILES
+ for LIB in `grep '^libraries/[^ ]\+ \+- \+[^ ]\+ \+[^ ]\+ \+[^ ]\+' ../packages | sed -e 's#libraries/##' -e 's/ .*//'`
do
- LIBPATH=`echo "$HADDOCK_FILE" | sed 's#/dist-install.*##'`
- NAME=`echo "$HADDOCK_FILE" | sed 's#.*/##' | sed 's#\.haddock$##'`
- # It's easier to portably remove tabs with tr than to try to get
- # sed to do what we want
- VERSION=`grep -i '^version:' $LIBPATH/$NAME.cabal | sed 's/.*://' | tr -d ' \t'`
- HADDOCK_ARG="--read-interface=${NAME}-${VERSION},$HADDOCK_FILE"
- HADDOCK_ARGS="$HADDOCK_ARGS $HADDOCK_ARG"
+ HADDOCK_FILE="$LIB/dist-install/doc/html/$LIB/$LIB.haddock"
+ if [ -f "$HADDOCK_FILE" ]
+ then
+ LIBPATH=`echo "$HADDOCK_FILE" | sed 's#/dist-install.*##'`
+ NAME=`echo "$HADDOCK_FILE" | sed 's#.*/##' | sed 's#\.haddock$##'`
+ # It's easier to portably remove tabs with tr than to try to get
+ # sed to do what we want
+ VERSION=`grep -i '^version:' $LIBPATH/$NAME.cabal | sed 's/.*://' | tr -d ' \t'`
+ HADDOCK_ARG="--read-interface=${NAME}-${VERSION},$HADDOCK_FILE"
+ HADDOCK_ARGS="$HADDOCK_ARGS $HADDOCK_ARG"
+ fi
done
;;
*)