diff options
| -rw-r--r-- | Main.hs | 2 | ||||
| -rw-r--r-- | XMonad/Core.hs | 20 |
2 files changed, 15 insertions, 7 deletions
@@ -44,7 +44,7 @@ main = do buildLaunch :: IO () buildLaunch = do recompile - dir <- fmap (++ "/.xmonad") getHomeDirectory + dir <- fmap (++ "/.xmonad") getHomeDirectory args <- getArgs executeFile (dir ++ "/xmonad") False args Nothing return () diff --git a/XMonad/Core.hs b/XMonad/Core.hs index ee5320c..90bfd9a 100644 --- a/XMonad/Core.hs +++ b/XMonad/Core.hs @@ -294,14 +294,22 @@ restart mprog resume = do -- | Recompile ~\/xmonad\/xmonad.hs. -- --- Raises an exception if ghc can't be found. +-- The -i flag is used to restrict recompilation to the xmonad.hs file. +-- Raises an exception if GHC can't be found, or if anything else goes wrong. +-- recompile :: IO () recompile = do - dir <- fmap (++ "/.xmonad") getHomeDirectory - pid <- runProcess "ghc" ["--make", "xmonad.hs", "-i"] (Just dir) - Nothing Nothing Nothing Nothing - waitForProcess pid - return () + dir <- liftM (++ "/.xmonad") getHomeDirectory + let src = dir ++ "/" ++ "xmonad.hs" + obj = dir ++ "/" ++ "xmonad.o" + yes <- doesFileExist src + when yes $ do + srcT <- getModificationTime src + objT <- getModificationTime obj + when (srcT > objT) $ do + waitForProcess =<< runProcess "ghc" ["--make", "xmonad.hs", "-i"] (Just dir) + Nothing Nothing Nothing Nothing + return () -- | Run a side effecting action with the current workspace. Like 'when' but whenJust :: Monad m => Maybe a -> (a -> m ()) -> m () |