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

Run the buildhook with 'system'

Browse Source
This commit is contained in:
hirschen 2012-04-17 14:16:32 +02:00
parent ccb9d00191
commit 204c8cc744
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
yesod/Devel.hs
View File

@ -41,7 +41,8 @@ import System.FilePath (splitDirectories, dropExtension, takeExtension
import System.Posix.Types (EpochTime) import System.Posix.Types (EpochTime)
import System.PosixCompat.Files (modificationTime, getFileStatus) import System.PosixCompat.Files (modificationTime, getFileStatus)
import System.Process (createProcess, proc, terminateProcess, readProcess, ProcessHandle, import System.Process (createProcess, proc, terminateProcess, readProcess, ProcessHandle,
getProcessExitCode,waitForProcess, rawSystem, runInteractiveProcess) getProcessExitCode,waitForProcess, rawSystem,
runInteractiveProcess, system)
import System.IO (hClose, hIsEOF, hGetLine, stdout, stderr, hPutStrLn) import System.IO (hClose, hIsEOF, hGetLine, stdout, stderr, hPutStrLn)
import System.IO.Error (isDoesNotExistError) import System.IO.Error (isDoesNotExistError)
@ -111,8 +112,11 @@ devel opts passThroughArgs = do
pkgArgs <- ghcPackageArgs opts ghcVer (D.packageDescription gpd) lib pkgArgs <- ghcPackageArgs opts ghcVer (D.packageDescription gpd) lib
let devArgs = pkgArgs ++ ["devel.hs"] ++ passThroughArgs let devArgs = pkgArgs ++ ["devel.hs"] ++ passThroughArgs
if not success if not success
then putStrLn "Build failure, pausing..." then do
putStrLn "Build failure, pausing..."
runBuildHook $ failHook opts
else do else do
runBuildHook $ successHook opts
removeLock removeLock
putStrLn $ if verbose opts then "Starting development server: runghc " ++ L.unwords devArgs putStrLn $ if verbose opts then "Starting development server: runghc " ++ L.unwords devArgs
else "Starting development server..." else "Starting development server..."
@ -125,10 +129,19 @@ devel opts passThroughArgs = do
putStrLn "Terminating development server..." putStrLn "Terminating development server..."
terminateProcess ph terminateProcess ph
ec <- waitForProcess' ph ec <- waitForProcess' ph
putStrLn $ "Exit code: " ++ show ec
Ex.throwTo watchTid (userError "process finished") Ex.throwTo watchTid (userError "process finished")
watchForChanges hsSourceDirs [cabal] list watchForChanges hsSourceDirs [cabal] list
runBuildHook :: Maybe String -> IO ()
runBuildHook m = case m of
Just s -> do
ret <- system s
case ret of
ExitFailure f -> putStrLn $ "Error executing hook: " ++ s
otherwise -> return ()
Nothing -> return ()
{- {-
configure with the built-in Cabal lib for non-cabal-dev, since configure with the built-in Cabal lib for non-cabal-dev, since

4
yesod/Types.hs
View File

@ -33,7 +33,7 @@ mkOptSuccessHook name = option name (\o -> o
, optionShortFlags = ['s'] , optionShortFlags = ['s']
, optionType = optionTypeMaybe optionTypeString , optionType = optionTypeMaybe optionTypeString
, optionDefault = "" , optionDefault = ""
, optionDescription = "Command to run when compilation succeeds (e.g. 'beep')" , optionDescription = "Shell command to run when compilation succeeds (e.g. 'beep')"
}) })
mkOptFailHook name = option name (\o -> o mkOptFailHook name = option name (\o -> o
@ -41,7 +41,7 @@ mkOptFailHook name = option name (\o -> o
, optionShortFlags = ['f'] , optionShortFlags = ['f']
, optionType = optionTypeMaybe optionTypeString , optionType = optionTypeMaybe optionTypeString
, optionDefault = "" , optionDefault = ""
, optionDescription = "Command to run when compilation fails (e.g. 'beep')" , optionDescription = "Shell command to run when compilation fails (e.g. 'beep')"
}) })
mkOptVerbose name = option name (\o -> o mkOptVerbose name = option name (\o -> o