diff options
author | Ben Gamari <ben@smart-cactus.org> | 2015-07-06 11:15:58 +0200 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2015-07-06 11:16:02 +0200 |
commit | fef5dc9ea61b5671101339e58a27b21eea6aa78d (patch) | |
tree | 2985684c4bd423480298257206e4df86554e9389 | |
parent | 73bde5b1a70ce02373ac73885b7260194f30fb44 (diff) | |
download | haskell-ghc-7.4.tar.gz |
Revert "Add --verbose and --help flags to gen_contents_index"ghc-7.4
This reverts commit e1e68550026b83ba15158fa776f406844cccedd1 which was
accidentally pushed.
-rw-r--r-- | libraries/gen_contents_index | 37 |
1 files changed, 7 insertions, 30 deletions
diff --git a/libraries/gen_contents_index b/libraries/gen_contents_index index dde6fbe3d9..c8d82c8da6 100644 --- a/libraries/gen_contents_index +++ b/libraries/gen_contents_index @@ -2,32 +2,10 @@ set -e -USAGE="Usage: $0 [--inplace] [--verbose] [--help]" -INPLACE= -VERBOSE= - HADDOCK_ARGS= -while [ "$#" -ne "0" ] -do - case "$1" in - --inplace) - INPLACE=yes - ;; - --verbose) - VERBOSE=yes - ;; - --help) - echo "$USAGE" - exit 0 - ;; - esac - - shift -done - -if [ -n "$INPLACE" ] -then +case $* in +--inplace) HADDOCK=../inplace/bin/haddock for REPO in `grep '^libraries/[^ ]* *- ' ../packages | sed -e 's#libraries/##' -e 's/ .*//'` do @@ -54,7 +32,8 @@ then fi done done -else + ;; +*) HADDOCK=../../../../../bin/haddock # We don't want the GHC API to swamp the index HADDOCK_FILES=`ls -1 */*.haddock | grep -v '/ghc\.haddock' | sort` @@ -64,13 +43,11 @@ else HADDOCK_ARG="--read-interface=${NAME_VERSION},$HADDOCK_FILE" HADDOCK_ARGS="$HADDOCK_ARGS $HADDOCK_ARG" done -fi + ;; +esac # Now create the combined contents and index pages -if [ -n "$VERBOSE" ] -then - echo $HADDOCK_ARGS -fi +echo $HADDOCK_ARGS $HADDOCK --gen-index --gen-contents -o . \ -t "Haskell Hierarchical Libraries" \ -p "prologue.txt" \ |