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

fix yesod --dev devel. closes #283

Browse Source
This commit is contained in:
Greg Weber 2012-03-01 08:48:38 -08:00
parent 3d59a32ef3
commit 031d38d392
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
yesod/Devel.hs
View File

@ -95,7 +95,7 @@ devel isCabalDev passThroughArgs = do
_ -> do _ -> do
removeLock removeLock
let pkg = pkgConfigs isCabalDev ghcVer let pkg = pkgConfigs isCabalDev ghcVer
let dev_args = ([pkg, "devel.hs"] ++ passThroughArgs) let dev_args = pkg ++ ["devel.hs"] ++ passThroughArgs
putStrLn $ "Starting development server: runghc " ++ L.intercalate " " dev_args putStrLn $ "Starting development server: runghc " ++ L.intercalate " " dev_args
(_,_,_,ph) <- createProcess $ proc "runghc" dev_args (_,_,_,ph) <- createProcess $ proc "runghc" dev_args
watchTid <- forkIO . try_ $ do watchTid <- forkIO . try_ $ do
@ -113,10 +113,10 @@ devel isCabalDev passThroughArgs = do
try_ :: forall a. IO a -> IO () try_ :: forall a. IO a -> IO ()
try_ x = (Ex.try x :: IO (Either Ex.SomeException a)) >> return () try_ x = (Ex.try x :: IO (Either Ex.SomeException a)) >> return ()
pkgConfigs :: Bool -> String -> String pkgConfigs :: Bool -> String -> [String]
pkgConfigs isCabalDev ghcVer pkgConfigs isCabalDev ghcVer
| isCabalDev = unwords ["-package-confcabal-dev/packages-" ++ ghcVer ++ ".conf", inplacePkg] | isCabalDev = ["-package-confcabal-dev/packages-" ++ ghcVer ++ ".conf", inplacePkg]
| otherwise = inplacePkg | otherwise = [inplacePkg]
where where
inplacePkg = "-package-confdist/package.conf.inplace" inplacePkg = "-package-confdist/package.conf.inplace"