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

isDevel -> isCabalDev, print runghc command

Browse Source
This commit is contained in:
Greg Weber 2012-01-26 12:30:38 -03:00
parent 9b92215819
commit 8c35873291
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
yesod/Devel.hs
View File

@ -49,7 +49,7 @@ removeLock :: IO ()
removeLock = try_ (removeFile lockFile) removeLock = try_ (removeFile lockFile)
devel :: Bool -> IO () devel :: Bool -> IO ()
devel isDevel = do devel isCabalDev = do
writeLock writeLock
putStrLn "Yesod devel server. Press ENTER to quit" putStrLn "Yesod devel server. Press ENTER to quit"
@ -59,7 +59,7 @@ devel isDevel = do
checkCabalFile gpd checkCabalFile gpd
_ <- if isDevel _ <- if isCabalDev
then rawSystem "cabal-dev" then rawSystem "cabal-dev"
[ "configure" [ "configure"
, "--cabal-install-arg=-fdevel" -- legacy , "--cabal-install-arg=-fdevel" -- legacy
@ -73,7 +73,7 @@ devel isDevel = do
, "--disable-library-profiling" , "--disable-library-profiling"
] ]
mainLoop isDevel mainLoop isCabalDev
_ <- getLine _ <- getLine
writeLock writeLock
@ -82,20 +82,21 @@ devel isDevel = do
mainLoop :: Bool -> IO () mainLoop :: Bool -> IO ()
mainLoop isDevel = forever $ do mainLoop isCabalDev = forever $ do
putStrLn "Rebuilding application..." putStrLn "Rebuilding application..."
recompDeps recompDeps
list <- getFileList list <- getFileList
_ <- if isDevel _ <- if isCabalDev
then rawSystem "cabal-dev" ["build"] then rawSystem "cabal-dev" ["build"]
else rawSystem "cabal" ["build"] else rawSystem "cabal" ["build"]
removeLock removeLock
putStrLn "Starting development server..." pkg <- pkgConfigs isCabalDev
pkg <- pkgConfigs isDevel let start = concat ["runghc ", pkg, " devel.hs"]
ph <- runCommand $ concat ["runghc ", pkg, " devel.hs"] putStrLn $ "Starting development server: " ++ start
ph <- runCommand start
watchTid <- forkIO . try_ $ do watchTid <- forkIO . try_ $ do
watchForChanges list watchForChanges list
putStrLn "Stopping development server..." putStrLn "Stopping development server..."