Browse Source

Update build environment for wai to use stack

Isamu Mogi 9 years ago
parent
commit
b208e71b42

+ 1 - 4
frameworks/Haskell/wai/.gitignore

@@ -1,4 +1 @@
-bench/cabal-dev
-bench/dist
-/bench/.cabal-sandbox/
-/bench/cabal.sandbox.config
+/bench/.stack-work/

+ 8 - 8
frameworks/Haskell/wai/bench/bench.cabal

@@ -1,4 +1,4 @@
-name:              bench-wai
+name:              bench
 version:           0.0.0
 cabal-version:     >= 1.8
 build-type:        Simple
@@ -11,12 +11,12 @@ executable         bench
 
     extensions: OverloadedStrings
 
-    build-depends: base                          >= 4.7        && < 5
-                 , aeson                         >= 0.6.1.0
+    build-depends: base
+                 , aeson
                  , http-types
-                 , network                       >= 2.4
-                 , text                          >= 1.0
-                 , wai                           >= 3.0
-                 , warp                          >= 3.0
+                 , network
+                 , text
+                 , wai
+                 , warp
                  , blaze-builder
-                 , bytestring                    >= 0.10
+                 , bytestring

+ 5 - 0
frameworks/Haskell/wai/bench/stack.yaml

@@ -0,0 +1,5 @@
+flags: {}
+packages:
+- '.'
+extra-deps: []
+resolver: lts-5.14

+ 3 - 5
frameworks/Haskell/wai/setup.sh

@@ -1,11 +1,9 @@
 #!/bin/bash
 
-fw_depends haskell
+fw_depends stack
 
 cd bench
 
-cabal update
-cabal sandbox init
-cabal --bindir=${TROOT}/bench/dist/build/bench install
+${IROOT}/stack --allow-different-user build --install-ghc
 
-dist/build/bench/bench ${MAX_THREADS} ${DBHOST} +RTS -A32m -N${MAX_THREADS} &
+${IROOT}/stack --allow-different-user exec bench ${MAX_THREADS} ${DBHOST} +RTS -A32m -N${MAX_THREADS} &

+ 0 - 1
frameworks/Haskell/wai/source_code

@@ -1,3 +1,2 @@
 ./wai/bench/
 ./wai/bench/wai.hs
-./wai/bench/bench.cabal