X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverMkDepend.hs;h=5d49e540a6e8b291faaec0402bb1bcf5a6d40e20;hb=e3b49acc7f2bdb14bfb59886877a0c639ea71c71;hp=64c99bba2c5ffbeb702469265661b17014b90b04;hpb=4cef3202f8067fc3e9860e7a2b72c10b313b7366;p=ghc-hetmet.git diff --git a/ghc/compiler/main/DriverMkDepend.hs b/ghc/compiler/main/DriverMkDepend.hs index 64c99bb..5d49e54 100644 --- a/ghc/compiler/main/DriverMkDepend.hs +++ b/ghc/compiler/main/DriverMkDepend.hs @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- --- $Id: DriverMkDepend.hs,v 1.11 2001/05/28 03:31:19 sof Exp $ +-- $Id: DriverMkDepend.hs,v 1.20 2002/03/21 09:00:54 simonpj Exp $ -- -- GHC Driver -- @@ -11,13 +11,15 @@ module DriverMkDepend where #include "HsVersions.h" -import DriverState -import DriverUtil +import DriverState +import DriverUtil ( add, softGetDirectoryContents ) import DriverFlags -import TmpFiles -import Module -import Config -import Util +import SysTools ( newTempName ) +import qualified SysTools +import Module ( ModuleName, moduleNameUserString, isHomeModule ) +import Finder ( findModuleDep ) +import HscTypes ( ModuleLocation(..) ) +import Util ( global ) import Panic import IOExts @@ -25,8 +27,12 @@ import Exception import Directory import IO -import Monad -import Maybe +import Monad ( when ) +import Maybe ( isJust ) + +#if __GLASGOW_HASKELL__ <= 408 +import Util ( catchJust, ioErrors ) +#endif ------------------------------------------------------------------------------- -- mkdependHS @@ -34,8 +40,7 @@ import Maybe -- flags GLOBAL_VAR(v_Dep_makefile, "Makefile", String); GLOBAL_VAR(v_Dep_include_prelude, False, Bool); -GLOBAL_VAR(v_Dep_ignore_dirs, [], [String]); -GLOBAL_VAR(v_Dep_exclude_mods, [], [String]); +GLOBAL_VAR(v_Dep_exclude_mods, ["GHC.Prim"], [String]); GLOBAL_VAR(v_Dep_suffixes, [], [String]); GLOBAL_VAR(v_Dep_warnings, True, Bool); @@ -50,17 +55,14 @@ depEndMarker = "# DO NOT DELETE: End of Haskell dependencies" -- for compatibility with the old mkDependHS, we accept options of the form -- -optdep-f -optdep.depend, etc. -dep_opts = [ - ( "s", SepArg (add v_Dep_suffixes) ), - ( "f", SepArg (writeIORef v_Dep_makefile) ), - ( "w", NoArg (writeIORef v_Dep_warnings False) ), - ( "-include-prelude", NoArg (writeIORef v_Dep_include_prelude True) ), - ( "X", Prefix (addToDirList v_Dep_ignore_dirs) ), - ( "-exclude-directory=", Prefix (addToDirList v_Dep_ignore_dirs) ) --- ( "-exclude-module=", Prefix (add v_Dep_exclude_mods) ) --- ( "x", Prefix (add v_Dep_exclude_mods) ) - - ] +dep_opts = + [ ( "s", SepArg (add v_Dep_suffixes) ) + , ( "f", SepArg (writeIORef v_Dep_makefile) ) + , ( "w", NoArg (writeIORef v_Dep_warnings False) ) + , ( "-include-prelude", NoArg (writeIORef v_Dep_include_prelude True) ) + , ( "-exclude-module=", Prefix (add v_Dep_exclude_mods) ) + , ( "x", Prefix (add v_Dep_exclude_mods) ) + ] beginMkDependHS :: IO () beginMkDependHS = do @@ -123,11 +125,6 @@ beginMkDependHS = do (zip import_dirs import_dir_contents ++ zip pkg_import_dirs pkg_import_dir_contents) - -- ignore packages unless --include-prelude is on - include_prelude <- readIORef v_Dep_include_prelude - when (not include_prelude) $ - mapM_ (add v_Dep_ignore_dirs) pkg_import_dirs - return () @@ -145,7 +142,7 @@ endMkDependHS = do Nothing -> return () Just hdl -> do - -- slurp the rest of the orignal makefile and copy it into the output + -- slurp the rest of the original makefile and copy it into the output let slurp = do l <- hGetLine hdl hPutStrLn tmp_hdl l @@ -158,52 +155,29 @@ endMkDependHS = do hClose tmp_hdl -- make sure it's flushed - -- create a backup of the original makefile - when (isJust makefile_hdl) $ - runSomething ("Backing up " ++ makefile) - (unwords [ cCP, dosifyPath makefile, dosifyPath $ makefile++".bak" ]) + -- Create a backup of the original makefile + when (isJust makefile_hdl) + (SysTools.copy ("Backing up " ++ makefile) makefile (makefile++".bak")) - -- copy the new makefile in place - runSomething "Installing new makefile" - (unwords [ cCP, dosifyPath tmp_file, dosifyPath makefile ]) + -- Copy the new makefile in place + SysTools.copy "Installing new makefile" tmp_file makefile findDependency :: Bool -> FilePath -> ModuleName -> IO (Maybe (String, Bool)) findDependency is_source src imp = do - dir_contents <- readIORef v_Dep_dir_contents - ignore_dirs <- readIORef v_Dep_ignore_dirs - excl_mods <- readIORef v_Dep_exclude_mods - hisuf <- readIORef v_Hi_suf - - let - imp_mod = moduleNameUserString imp - imp_hi = imp_mod ++ '.':hisuf - imp_hiboot = imp_mod ++ ".hi-boot" - imp_hiboot_v = imp_mod ++ ".hi-boot-" ++ cHscIfaceFileVersion - imp_hs = imp_mod ++ ".hs" - imp_lhs = imp_mod ++ ".lhs" - - deps | is_source = [ imp_hiboot_v, imp_hiboot, imp_hs, imp_lhs ] - | otherwise = [ imp_hi, imp_hs, imp_lhs ] - - search [] = throwDyn (ProgramError (src ++ ": " ++ "can't find one of the following: " ++ - unwords (map (\d -> '`': d ++ "'") deps))) - search ((dir, contents) : dirs) - | null present = search dirs - | otherwise = - if dir `elem` ignore_dirs - then return Nothing - else if is_source - then if dep /= imp_hiboot_v - then return (Just (dir++'/':imp_hiboot, False)) - else return (Just (dir++'/':dep, False)) - else return (Just (dir++'/':imp_hi, not is_source)) - where - present = filter (`elem` contents) deps - dep = head present - - -- in - if imp_mod `elem` excl_mods then - return Nothing - else - search dir_contents + excl_mods <- readIORef v_Dep_exclude_mods + include_prelude <- readIORef v_Dep_include_prelude + let imp_mod = moduleNameUserString imp + if imp_mod `elem` excl_mods + then return Nothing + else do + r <- findModuleDep imp is_source + case r of + Just (mod,loc) + | isHomeModule mod || include_prelude + -> return (Just (ml_hi_file loc, not is_source)) + | otherwise + -> return Nothing + Nothing -> throwDyn (ProgramError + (src ++ ": " ++ "can't locate import `" ++ imp_mod ++ "'" ++ + if is_source then " (SOURCE import)" else ""))