bddcb56 · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

Merge pull request #1197 from david-christiansen/travisdoc

bddcb56David Christiansen12 years ago

.travis.yml+8−6

@@ -6,6 +6,8 @@ before_install:

6 - sudo apt-get install -qq libghc-unordered-containers-dev libghc-mtl-dev libghc-network-dev libghc-xml-dev libghc-transformers-dev libghc-text-dev libghc-utf8-string-dev libghc-vector-dev libghc-split-dev libghc-ansi-terminal-dev libghc-ansi-wl-pprint-dev

7 # trifecta dependencies

8 - sudo apt-get install -qq libghc-blaze-builder-dev libghc-blaze-html-dev libghc-data-lens-dev libghc-bifunctors-dev libghc-hashable-dev libghc-semigroups-dev libghc-semigroupoids-dev libghc-parallel-dev libghc-comonad-dev libghc-terminfo-dev libghc-keys-dev

9+ # Haddock dependencies

10+ - sudo apt-get install hscolour

9 # test dependency

11 # test dependency

10 - sudo apt-get install -qq expect

12 - sudo apt-get install -qq expect

11install:

13install:

@@ -17,11 +19,11 @@ before_script:

17 - cd idris*

19 - cd idris*

18script:

20script:

19 - cabal configure -f FFI -f LLVM

21 - cabal configure -f FFI -f LLVM

20− - cabal build

22+ - if [[ "$TESTS" != "doc" ]]; then cabal build; fi

21− - cabal copy

23+ - if [[ "$TESTS" != "doc" ]]; then cabal copy; fi

22 - make -j2 $TESTS

24 - make -j2 $TESTS

23env:

25env:

24− # TESTS=doc

26+ - TESTS="doc"

25− - TESTS=test_c

27+ - TESTS="test_c"

26− - TESTS=test_llvm

28+ - TESTS="test_llvm"

27− - TESTS=test_js

29+ - TESTS="test_js"

Makefile+1−1

@@ -43,7 +43,7 @@ linecount:

44#Note: this doesn't yet link to Hackage properly

45doc: dist/setup-config

46− $(CABAL) haddock --executables --hyperlink-source --html --hoogle --html-location="http://hackage.haskell.org/packages/archive/\$$pkg/latest/doc/html" --haddock-options="--title Idris"

46+ $(CABAL) haddock --hyperlink-source --html --hoogle --html-location="http://hackage.haskell.org/packages/archive/\$$pkg/latest/doc/html" --haddock-options="--title Idris"

49dist/setup-config: