add stack file

.gitignore

@@ -22,3 +22,4 @@ cabal.config
 *.aux
 *.hp
 Setup
+.stack-work

servant-js/servant-js.cabal

@@ -80,7 +80,7 @@ test-suite spec
     , lens
     , servant-js
     , servant
-    , hspec >= 2.0
+    , hspec >= 2.1.8
     , hspec-expectations
     , language-ecmascript >= 0.16
   default-language: Haskell2010

servant-server/test/Doctests.hs

@@ -9,23 +9,33 @@ import           Test.DocTest
 main :: IO ()
 main = do
     files <- find always (extension ==? ".hs") "src"
-    cabalMacrosFile <- getCabalMacrosFile
+    mCabalMacrosFile <- getCabalMacrosFile
-    doctest $ [ "-isrc"
+    doctest $ "-isrc" :
-              , "-optP-include"
+              (maybe [] (\ f -> ["-optP-include", "-optP" ++ f]) mCabalMacrosFile) ++
-              , "-optP" ++ cabalMacrosFile
+              "-XOverloadedStrings" :
-              , "-XOverloadedStrings"
+              "-XFlexibleInstances" :
-              , "-XFlexibleInstances"
+              "-XMultiParamTypeClasses" :
-              , "-XMultiParamTypeClasses"
+              "-XDataKinds" :
-              , "-XDataKinds"
+              "-XTypeOperators" :
-              , "-XTypeOperators"
+              files
-              ] ++ files
 
-getCabalMacrosFile :: IO FilePath
+getCabalMacrosFile :: IO (Maybe FilePath)
 getCabalMacrosFile = do
+  exists <- doesDirectoryExist "dist"
+  if exists
+    then do
       contents <- getDirectoryContents "dist"
       let rest = "build" </> "autogen" </> "cabal_macros.h"
-  return $ case filter ("dist-sandbox-" `isPrefixOf`) contents of
+      whenExists $ case filter ("dist-sandbox-" `isPrefixOf`) contents of
         [x] -> "dist" </> x </> rest
         [] -> "dist" </> rest
         xs -> error $ "ran doctests with multiple dist/dist-sandbox-xxxxx's: \n"
                     ++ show xs ++ "\nTry cabal clean"
+    else return Nothing
+ where
+  whenExists :: FilePath -> IO (Maybe FilePath)
+  whenExists file = do
+    exists <- doesFileExist file
+    return $ if exists
+      then Just file
+      else Nothing

servant/test/Doctests.hs

@@ -9,21 +9,31 @@ import           Test.DocTest
 main :: IO ()
 main = do
     files <- find always (extension ==? ".hs") "src"
-    cabalMacrosFile <- getCabalMacrosFile
+    mCabalMacrosFile <- getCabalMacrosFile
-    doctest $ [ "-isrc"
+    doctest $ "-isrc" :
-              , "-optP-include"
+              (maybe [] (\ f -> ["-optP-include", "-optP" ++ f]) mCabalMacrosFile) ++
-              , "-optP" ++ cabalMacrosFile
+              "-XOverloadedStrings" :
-              , "-XOverloadedStrings"
+              "-XFlexibleInstances" :
-              , "-XFlexibleInstances"
+              "-XMultiParamTypeClasses" :
-              , "-XMultiParamTypeClasses"
+              files
-              ] ++ files
 
-getCabalMacrosFile :: IO FilePath
+getCabalMacrosFile :: IO (Maybe FilePath)
 getCabalMacrosFile = do
+  exists <- doesDirectoryExist "dist"
+  if exists
+    then do
       contents <- getDirectoryContents "dist"
       let rest = "build" </> "autogen" </> "cabal_macros.h"
-  return $ case filter ("dist-sandbox-" `isPrefixOf`) contents of
+      whenExists $ case filter ("dist-sandbox-" `isPrefixOf`) contents of
         [x] -> "dist" </> x </> rest
         [] -> "dist" </> rest
         xs -> error $ "ran doctests with multiple dist/dist-sandbox-xxxxx's: \n"
                     ++ show xs ++ "\nTry cabal clean"
+    else return Nothing
+ where
+  whenExists :: FilePath -> IO (Maybe FilePath)
+  whenExists file = do
+    exists <- doesFileExist file
+    return $ if exists
+      then Just file
+      else Nothing

stack.yaml

@@ -0,0 +1,15 @@
+flags:
+  servant-js:
+    example: false
+packages:
+- servant/
+- servant-blaze/
+- servant-client/
+- servant-docs/
+- servant-examples/
+- servant-js/
+- servant-lucid/
+- servant-mock/
+- servant-server/
+extra-deps: []
+resolver: nightly-2015-07-24