hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Must explicitly find the full path for an exe target

Browse Source
This commit is contained in:
Alan Zimmerman 2013-09-21 16:08:45 +02:00
parent 93195cb780
commit 54bb83e972
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Language/Haskell/GhcMod/CabalApi.hs
View File

@ -11,6 +11,8 @@ module Language.Haskell.GhcMod.CabalApi (
import Control.Applicative ((<$>)) import Control.Applicative ((<$>))
import Control.Exception (throwIO) import Control.Exception (throwIO)
import Control.Monad (filterM)
import CoreMonad (liftIO)
import Data.Maybe (maybeToList) import Data.Maybe (maybeToList)
import Data.Set (fromList, toList) import Data.Set (fromList, toList)
import Distribution.ModuleName (ModuleName,toFilePath) import Distribution.ModuleName (ModuleName,toFilePath)
@ -165,18 +167,18 @@ getGHC = do
-- | Extracting all 'Module' 'FilePath's for libraries, executables, -- | Extracting all 'Module' 'FilePath's for libraries, executables,
-- tests and benchmarks. -- tests and benchmarks.
cabalAllTargets :: PackageDescription -> ([String],[String],[String],[String]) cabalAllTargets :: PackageDescription -> IO ([String],[String],[String],[String])
cabalAllTargets pd = targets cabalAllTargets pd = do
exeTargets <- mapM getExecutableTarget $ executables pd
return (libTargets,concat exeTargets,testTargets,benchTargets)
where where
lib = case library pd of lib = case library pd of
Nothing -> [] Nothing -> []
Just l -> libModules l Just l -> libModules l
targets = (map toModuleString $ lib, libTargets = map toModuleString $ lib
map (fromFilePath . modulePath) $ executables pd, testTargets = concatMap getTestTargets $ map testInterface $ testSuites pd
-- map toModuleString $ concatMap testModules $ testSuites pd, benchTargets = map toModuleString $ concatMap benchmarkModules $ benchmarks pd
concatMap getTestTargets $ map testInterface $ testSuites pd,
map toModuleString $ concatMap benchmarkModules $ benchmarks pd)
toModuleString :: ModuleName -> String toModuleString :: ModuleName -> String
toModuleString mn = fromFilePath $ toFilePath mn toModuleString mn = fromFilePath $ toFilePath mn
@ -188,3 +190,9 @@ cabalAllTargets pd = targets
getTestTargets (TestSuiteExeV10 _ filePath) = [fromFilePath filePath] getTestTargets (TestSuiteExeV10 _ filePath) = [fromFilePath filePath]
getTestTargets (TestSuiteLibV09 _ moduleName) = [toModuleString moduleName] getTestTargets (TestSuiteLibV09 _ moduleName) = [toModuleString moduleName]
getTestTargets (TestSuiteUnsupported _) = [] getTestTargets (TestSuiteUnsupported _) = []
getExecutableTarget :: Executable -> IO [String]
getExecutableTarget exe = do
let maybeExes = [p </> e | p <- hsSourceDirs $ buildInfo exe, e <- [modulePath exe]]
liftIO $ filterM doesFileExist maybeExes