b102f81 · jsaddle · git.iko.soy

git.iko.soy/jsaddle

on master help sign in

Update travis script to get dependencies from hackage

b102f81Hamish Mackenzie13 years ago

.travis.yml+4−7

compare with master

unifiedsplit

@@ -2,14 +2,11 @@ language: haskell

2before_install:

3 - sudo apt-get update -qq

4 - sudo apt-get --no-install-recommends install darcs libwebkitgtk-3.0-dev

5− - mkdir vendor

5+ - cabal install Cabal

6− - cd vendor

7− - darcs get --lazy http://code.haskell.org/gtk2hs/

8− - cabal install ./gtk2hs/tools

6+ - cabal install cabal-install

9− - cd ..

10install:

7install:

11− - cabal install cabal-meta cabal-src

8+ - cabal install gtk2hs-buildtools

12− - cabal-meta install --enable-tests --force-reinstalls

9+ - cabal install --enable-tests

13script:

10script:

14 - cabal test

11 - cabal test

15notifications:

12notifications:

jsc.cabal+4−4

@@ -36,10 +36,10 @@ library

36 cpp-options: -DUSE_WEBKIT

37 if flag(gtk3)

38 build-depends: webkitgtk3 >=0.12.5 && <0.13,

39− webkitgtk3-javascriptcore >=0.0.0.999 && <0.1

39+ webkitgtk3-javascriptcore >=0.12.5 && <0.13

40 else

41 build-depends: webkit >=0.12.5 && <0.13,

42− webkit-javascriptcore >=0.0.0.999 && <0.1

42+ webkit-javascriptcore >=0.12.5 && <0.13

44 if flag(jmacro)

45 exposed-modules: Language.Javascript.JSC.JMacro

@@ -75,11 +75,11 @@ test-suite test-tool

75 if flag(gtk3)

76 build-depends: gtk3 >= 0.12.4.1 && <0.13,

77 webkitgtk3 >=0.12.5 && <0.13,

78− webkitgtk3-javascriptcore >=0.0.0.999 && <0.1

78+ webkitgtk3-javascriptcore >=0.12.5 && <0.13

79 else

80 build-depends: gtk >= 0.12.4.1 && <0.13,

81 webkit >=0.12.5 && <0.13,

82− webkit-javascriptcore >=0.0.0.999 && <0.1

82+ webkit-javascriptcore >=0.12.5 && <0.13

84 if flag(jmacro)

85 build-depends: jmacro >=0.6.3 && <0.8