projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Trac #2914: record wild cards and assoicated types
[ghc-hetmet.git]
/
libraries
/
gen_contents_index
diff --git
a/libraries/gen_contents_index
b/libraries/gen_contents_index
index
8129beb
..
ea9f4b9
100644
(file)
--- a/
libraries/gen_contents_index
+++ b/
libraries/gen_contents_index
@@
-2,22
+2,28
@@
set -e
set -e
-HADDOCK=../utils/haddock/install-inplace/bin/haddock
HADDOCK_ARGS=
NAMES=
case $* in
--inplace)
HADDOCK_ARGS=
NAMES=
case $* in
--inplace)
+ HADDOCK=../utils/haddock/install-inplace/bin/haddock
HADDOCK_FILES=`ls -1 */dist/doc/html/*/*.haddock | sort`
HADDOCK_FILES=`ls -1 */dist/doc/html/*/*.haddock | sort`
+ if [ -d dph ]
+ then
+ HADDOCK_FILES="$HADDOCK_FILES `ls -1 dph/*/dist/doc/html/*/*.haddock | sort`"
+ fi
;;
*)
;;
*)
- HADDOCK_FILES=`ls -1 */*.haddock | sort`
+ HADDOCK=../../../../bin/haddock
+ # We don't want the GHC API to swamp the index
+ HADDOCK_FILES=`ls -1 */*.haddock | grep -v "ghc/" | sort`
;;
esac
for HADDOCK_FILE in $HADDOCK_FILES
do
;;
esac
for HADDOCK_FILE in $HADDOCK_FILES
do
- NAME=`echo "$HADDOCK_FILE" | sed 's#/.*##'`
+ NAME=` echo "$HADDOCK_FILE" | sed 's#.*/##' | sed 's#\.haddock$##' `
HADDOCK_ARGS="$HADDOCK_ARGS --read-interface=$NAME,$HADDOCK_FILE"
NAMES="$NAMES $NAME"
done
HADDOCK_ARGS="$HADDOCK_ARGS --read-interface=$NAME,$HADDOCK_FILE"
NAMES="$NAMES $NAME"
done
@@
-25,6
+31,7
@@
done
# Now create the combined contents and index pages
$HADDOCK --gen-index --gen-contents -o . \
-t "Haskell Hierarchical Libraries" \
# Now create the combined contents and index pages
$HADDOCK --gen-index --gen-contents -o . \
-t "Haskell Hierarchical Libraries" \
+ -p "prologue.txt" \
$HADDOCK_ARGS
# Unhandled Windows help stuff?:
$HADDOCK_ARGS
# Unhandled Windows help stuff?: