From c6499bbe91cd56086a55096f3b62e09b1136a73d Mon Sep 17 00:00:00 2001 From: Bryan Richter Date: Wed, 22 Jul 2015 13:16:18 -0700 Subject: [PATCH] WIP for #1039 This works, but ignores previous cabal(-dev) options. I'll work to add them back in now. --- yesod-bin/Keter.hs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/yesod-bin/Keter.hs b/yesod-bin/Keter.hs index 5fcf8ac1..fcc792de 100644 --- a/yesod-bin/Keter.hs +++ b/yesod-bin/Keter.hs @@ -28,7 +28,7 @@ keter :: String -- ^ cabal command -> Bool -- ^ no build? -> Bool -- ^ no copy to? -> IO () -keter cabal noBuild noCopyTo = do +keter _cabal noBuild noCopyTo = do ketercfg <- keterConfig mvalue <- decodeFile ketercfg value <- @@ -73,9 +73,10 @@ keter cabal noBuild noCopyTo = do collapse' [] = [] unless noBuild $ do - run cabal ["clean"] - run cabal ["configure"] - run cabal ["build"] + run "stack" ["clean"] + -- run cabal ["configure"] + createDirectoryIfMissing True "./dist/bin" + run "stack" $ words "--local-bin-path ./dist/bin build --copy-bins" _ <- try' $ removeDirectoryRecursive "static/tmp"