b102f81 · jsaddle · git.iko.soy

git.iko.soy/jsaddle

Update travis script to get dependencies from hackage

commitb102f81e8387039ae9fd6440c6222aa595555c33 authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateSun 1 Dec 2013, 00:57 (13 years ago) parentd8985c2

2 files changed+8−11

compare with master

unifiedsplit

.travis.yml+4−7 jsc.cabal+4−4

.travis.yml+4−7

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

22before_install:

33 - sudo apt-get update -qq

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

5− - mkdir vendor

6− - cd vendor

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

8− - cabal install ./gtk2hs/tools

9− - cd ..

5+ - cabal install Cabal

6+ - cabal install cabal-install

107install:

11− - cabal install cabal-meta cabal-src

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

8+ - cabal install gtk2hs-buildtools

9+ - cabal install --enable-tests

1310script:

1411 - cabal test

1512notifications:

jsc.cabal+4−4

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

3636 cpp-options: -DUSE_WEBKIT

3737 if flag(gtk3)

3838 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

4040 else

4141 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

4343

4444 if flag(jmacro)

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

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

7575 if flag(gtk3)

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

7777 webkitgtk3 >=0.12.5 && <0.13,

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

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

7979 else

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

8181 webkit >=0.12.5 && <0.13,

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

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

8383

8484 if flag(jmacro)

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