Recache cabal-helper stuff when cabal-helper-* executable changes

CabalHelper/Wrapper.hs

@@ -54,16 +54,17 @@ usage = do
    usageMsg = "\
 \( print-appdatadir\n\
 \| print-build-platform\n\
-\| DIST_DIR [CABAL_HELPER_ARGS...]\n\
+\| DIST_DIR ( print-exe | [CABAL_HELPER_ARGS...] ) )\n"
-\)\n"
 
 main :: IO ()
 main = handlePanic $ do
   args <- getArgs
   case args of
+    [] -> usage
+    "--help":[] -> usage
     "print-appdatadir":[] -> putStrLn =<< appDataDir
     "print-build-platform":[] -> putStrLn $ display buildPlatform
-    distdir:_ -> do
+    distdir:args' -> do
       cfgf <- canonicalizePath (distdir </> "setup-config")
       mhdr <- getCabalConfigHeader cfgf
       case mhdr of
@@ -76,11 +77,12 @@ main = handlePanic $ do
           eexe <- compileHelper hdrCabalVersion
           case eexe of
               Left e -> exitWith e
-              Right exe -> do
+              Right exe ->
-                  (_,_,_,h) <- createProcess $ proc exe args
+                case args' of
-                  exitWith =<< waitForProcess h
+                  "print-exe":_ -> putStrLn exe
-
+                  _ -> do
-    _ -> usage
+                    (_,_,_,h) <- createProcess $ proc exe args
+                    exitWith =<< waitForProcess h
 
 appDataDir :: IO FilePath
 appDataDir = (</> "cabal-helper") <$> getAppUserDataDirectory "ghc-mod"
@@ -137,7 +139,7 @@ compileHelper cabalVer = do
               db <- installCabal cabalVer `E.catch`
                   \(SomeException _) -> errorInstallCabal cabalVer
               compileWithPkg chdir (Just db)
-        Just _ ->
+        Just _ -> do
           compileWithPkg chdir Nothing
 
  where
@@ -229,12 +231,25 @@ compile Compile {..} = do
 
     if recompile
        then do
+         -- TODO: touch exe after, ghc doesn't do that if the input files didn't
+         -- actually change
          rv <- callProcessStderr' Nothing "ghc" ghc_opts
          return $ case rv of
                     ExitSuccess -> Right exe
                     e@(ExitFailure _) -> Left e
       else return $ Right exe
 
+ where
+   timeHsFiles :: FilePath -> IO [TimedFile]
+   timeHsFiles dir = do
+       fs <- map (dir</>) <$> getDirectoryContents dir
+       mapM timeFile =<< filterM isHsFile (filter (=="Wrapper.hs") fs)
+    where
+      isHsFile f = do
+        exists <- doesFileExist f
+        return $ exists && ".hs" `isSuffixOf` f
+
+
 callProcessStderr' :: Maybe FilePath -> FilePath -> [String] -> IO ExitCode
 callProcessStderr' mwd exe args = do
   (_, _, _, h) <- createProcess (proc exe args) { std_out = UseHandle stderr
@@ -254,15 +269,6 @@ processFailedException fn exe args rv =
                      , intercalate " " (map show args)
                      , " (exit " ++ show rv ++ ")"]
 
-timeHsFiles :: FilePath -> IO [TimedFile]
-timeHsFiles dir = do
-    fs <- map (dir</>) <$> getDirectoryContents dir
-    mapM timeFile =<< filterM isHsFile fs
- where
-   isHsFile f = do
-     exists <- doesFileExist f
-     return $ exists && ".hs" `isSuffixOf` f
-
 installCabal :: Version -> IO FilePath
 installCabal ver = do
   db <- createPkgDb ver

Language/Haskell/GhcMod/CabalHelper.hs

@@ -80,18 +80,17 @@ data CabalHelper = CabalHelper {
 
 cabalHelper :: (MonadIO m, GmEnv m) => m CabalHelper
 cabalHelper = withCabal $ do
+  Cradle {..} <- cradle
   let cmds = [ "entrypoints"
              , "source-dirs"
              , "ghc-options"
              , "ghc-src-options"
              , "ghc-pkg-options" ]
+      distdir = cradleRootDir </> "dist"
 
-  Cradle {..} <- cradle
   exe <- liftIO $ findLibexecExe "cabal-helper-wrapper"
-
+  hexe <- liftIO $ readProcess exe [distdir, "print-exe"] ""
-  let distdir = cradleRootDir </> "dist"
+  res <- liftIO $ cached cradleRootDir (cabalHelperCache hexe cmds) $ do
-
-  res <- liftIO $ cached cradleRootDir (cabalHelperCache cmds) $ do
            out <- readProcess exe (distdir:cmds) ""
            evaluate (read out) `E.catch`
                \(SomeException _) -> error "cabalHelper: read failed"

Language/Haskell/GhcMod/PathsAndFiles.hs

@@ -233,9 +233,10 @@ cabalBuildPlatform = dropWhileEnd isSpace $ unsafePerformIO $
 packageCache :: String
 packageCache = "package.cache"
 
-cabalHelperCache :: [String] -> Cached [String] [Maybe GmCabalHelperResponse]
+cabalHelperCache ::
-cabalHelperCache cmds = Cached {
+    FilePath -> [String] -> Cached [String] [Maybe GmCabalHelperResponse]
-    inputFiles = [setupConfigPath],
+cabalHelperCache cabalHelperExe cmds = Cached {
+    inputFiles = [cabalHelperExe, setupConfigPath],
     inputData  = cmds,
     cacheFile  = setupConfigPath <.> "ghc-mod.cabal-helper"
   }