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

pass through args to yesod devel

Browse Source
This commit is contained in:
Greg Weber 2012-02-16 19:03:37 -08:00
parent 9b8b20e058
commit e1d584cf1f
2 changed files with 46 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
yesod/Devel.hs
View File

@ -28,7 +28,7 @@ import System.Exit (exitFailure, exitSuccess, ExitCode (..))
import System.FilePath (splitDirectories, dropExtension, takeExtension) 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 (runCommand, terminateProcess, readProcess, import System.Process (createProcess, proc, terminateProcess, readProcess,
waitForProcess, rawSystem) waitForProcess, rawSystem)
import Build (recompDeps, getDeps,findHaskellFiles) import Build (recompDeps, getDeps,findHaskellFiles)
@ -44,8 +44,8 @@ writeLock = do
removeLock :: IO () removeLock :: IO ()
removeLock = try_ (removeFile lockFile) removeLock = try_ (removeFile lockFile)
devel :: Bool -> IO () devel :: Bool -> [String] -> IO ()
devel isCabalDev = do devel isCabalDev passThroughArgs = do
checkDevelFile checkDevelFile
@ -58,28 +58,29 @@ devel isCabalDev = do
checkCabalFile gpd checkCabalFile gpd
_ <- if isCabalDev _<- rawSystem cmd args
then rawSystem "cabal-dev"
[ "configure"
, "--cabal-install-arg=-fdevel" -- legacy
, "--cabal-install-arg=-flibrary-only"
, "--disable-library-profiling"
]
else rawSystem "cabal"
[ "configure"
, "-fdevel" -- legacy
, "-flibrary-only"
, "--disable-library-profiling"
]
mainLoop isCabalDev mainLoop
_ <- getLine _ <- getLine
writeLock writeLock
exitSuccess exitSuccess
where
cmd | isCabalDev == True = "cabal-dev"
| otherwise = "cabal"
mainLoop :: Bool -> IO () diffArgs | isCabalDev == True = [
mainLoop isCabalDev = do "--cabal-install-arg=-fdevel" -- legacy
, "--cabal-install-arg=-flibrary-only"
]
| otherwise = [
"-fdevel" -- legacy
, "-flibrary-only"
]
args = "configure":diffArgs ++ ["--disable-library-profiling" ]
mainLoop :: IO ()
mainLoop = do
ghcVer <- ghcVersion ghcVer <- ghcVersion
forever $ do forever $ do
putStrLn "Rebuilding application..." putStrLn "Rebuilding application..."
@ -87,18 +88,16 @@ mainLoop isCabalDev = do
recompDeps recompDeps
list <- getFileList list <- getFileList
exit <- if isCabalDev exit <- rawSystem cmd ["build"]
then rawSystem "cabal-dev" ["build"]
else rawSystem "cabal" ["build"]
case exit of case exit of
ExitFailure _ -> putStrLn "Build failure, pausing..." ExitFailure _ -> putStrLn "Build failure, pausing..."
_ -> do _ -> do
removeLock removeLock
let pkg = pkgConfigs isCabalDev ghcVer let pkg = pkgConfigs isCabalDev ghcVer
let start = concat ["runghc ", pkg, " devel.hs"] let dev_args = ([pkg, "devel.hs"] ++ passThroughArgs)
putStrLn $ "Starting development server: " ++ start putStrLn $ "Starting development server: runghc " ++ L.intercalate " " dev_args
ph <- runCommand start (_,_,_,ph) <- createProcess $ proc "runghc" dev_args
watchTid <- forkIO . try_ $ do watchTid <- forkIO . try_ $ do
watchForChanges list watchForChanges list
putStrLn "Stopping development server..." putStrLn "Stopping development server..."

2
yesod/main.hs
View File

@ -35,7 +35,7 @@ main = do
"build":rest -> touch >> build rest >>= exitWith "build":rest -> touch >> build rest >>= exitWith
["touch"] -> touch ["touch"] -> touch
#endif #endif
["devel"] -> devel isDev "devel":rest -> devel isDev rest
["version"] -> putStrLn yesodVersion ["version"] -> putStrLn yesodVersion
"configure":rest -> rawSystem cmd ("configure":rest) >>= exitWith "configure":rest -> rawSystem cmd ("configure":rest) >>= exitWith
_ -> do _ -> do