haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[yesod-bin] improve stack detection for 'stack keter'

Browse Source 
The following will now use stack:

* `stack query` succeeds from current directory instead of searching that a `stack.yaml` exists
* `STACK_YAML` or `STACK_EXE`(set by `stack exec`) environment variables are set
This commit is contained in:
Luigy Leon 2016-02-18 17:57:31 -05:00
parent d8414c3c20
commit d87499deb5
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
yesod-bin/Keter.hs
View File

@ -6,11 +6,12 @@ module Keter
import Data.Yaml import Data.Yaml
import qualified Data.HashMap.Strict as Map import qualified Data.HashMap.Strict as Map
import qualified Data.Text as T import qualified Data.Text as T
import System.Environment (getEnvironment)
import System.Exit import System.Exit
import System.Process import System.Process
import Control.Monad import Control.Monad
import System.Directory hiding (findFiles) import System.Directory hiding (findFiles)
import Data.Maybe (mapMaybe) import Data.Maybe (mapMaybe,isJust,maybeToList)
import Data.Monoid import Data.Monoid
import System.FilePath ((</>)) import System.FilePath ((</>))
import qualified Codec.Archive.Tar as Tar import qualified Codec.Archive.Tar as Tar
@ -48,6 +49,8 @@ keter cabal noBuild noCopyTo buildArgs = do
_ -> return value _ -> return value
Just _ -> error $ ketercfg ++ " is not an object" Just _ -> error $ ketercfg ++ " is not an object"
env' <- getEnvironment
cwd' <- getCurrentDirectory
files <- getDirectoryContents "." files <- getDirectoryContents "."
project <- project <-
case mapMaybe (T.stripSuffix ".cabal" . T.pack) files of case mapMaybe (T.stripSuffix ".cabal" . T.pack) files of
@ -74,11 +77,22 @@ keter cabal noBuild noCopyTo buildArgs = do
collapse' (x:xs) = x : collapse' xs collapse' (x:xs) = x : collapse' xs
collapse' [] = [] collapse' [] = []
unless noBuild $ if elem "stack.yaml" files stackQueryRunSuccess <- do
then do run "stack" ["clean"] (ec,_,_) <- readProcessWithExitCode "stack" ["query"] ""
createDirectoryIfMissing True "./dist/bin" return (ec == ExitSuccess)
let inStackExec = isJust $ lookup "STACK_EXE" env'
mStackYaml = lookup "STACK_YAML" env'
useStack = inStackExec || isJust mStackYaml || stackQueryRunSuccess
unless noBuild $ if useStack
then do let stackYaml = maybeToList $ fmap ("--stack-yaml="<>) mStackYaml
localBinPath = cwd' </> "dist/bin"
run "stack" $ stackYaml <> ["clean"]
createDirectoryIfMissing True localBinPath
run "stack" run "stack"
((words "--local-bin-path ./dist/bin build --copy-bins") (stackYaml
<> ["--local-bin-path",localBinPath,"build","--copy-bins"]
<> buildArgs) <> buildArgs)
else do run cabal ["clean"] else do run cabal ["clean"]
run cabal ["configure"] run cabal ["configure"]