X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverMkDepend.hs;h=d1673ff38d1cd390cbd90f04a56466995e79ac03;hb=c5d45a35695a91a552a180951c67355e3d3ef4e0;hp=e22a1da246d32373ce00e11ccc7030c594fd4cf2;hpb=7752abc1008b633fdc7a0b9f283ceca40747b609;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/DriverMkDepend.hs b/ghc/compiler/main/DriverMkDepend.hs
index e22a1da..d1673ff 100644
--- a/ghc/compiler/main/DriverMkDepend.hs
+++ b/ghc/compiler/main/DriverMkDepend.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverMkDepend.hs,v 1.7 2000/12/12 14:35:08 simonmar Exp $
+-- $Id: DriverMkDepend.hs,v 1.16 2001/12/04 19:26:17 sof Exp $
 --
 -- GHC Driver
 --
@@ -14,9 +14,13 @@ module DriverMkDepend where
 import DriverState
 import DriverUtil
 import DriverFlags
-import TmpFiles
+import SysTools		( newTempName )
+import qualified SysTools
 import Module
 import Config
+import Module		( isHomeModule )
+import Finder		( findModuleDep )
+import HscTypes		( ModuleLocation(..) )
 import Util
 import Panic
 
@@ -34,7 +38,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_suffixes,		[], [String]);
 GLOBAL_VAR(v_Dep_warnings,		True, Bool);
 
@@ -49,14 +53,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) )
- ]
+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
@@ -113,17 +117,12 @@ beginMkDependHS = do
 	-- reference.
   import_dirs <- readIORef v_Import_paths
   pkg_import_dirs <- getPackageImportPath
-  import_dir_contents <- mapM getDirectoryContents import_dirs
-  pkg_import_dir_contents <- mapM getDirectoryContents pkg_import_dirs
+  import_dir_contents <- mapM softGetDirectoryContents import_dirs
+  pkg_import_dir_contents <- mapM softGetDirectoryContents pkg_import_dirs
   writeIORef v_Dep_dir_contents 
 	(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 ()
 
 
@@ -141,7 +140,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
@@ -154,50 +153,28 @@ 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 [ "cp", makefile, makefile++".bak" ])
-
-  	-- copy the new makefile in place
-  runSomething "Installing new makefile"
-	(unwords [ "cp", tmp_file, makefile ])
-
-
-findDependency :: Bool -> String -> ModuleName -> IO (Maybe (String, Bool))
-findDependency is_source mod imp = do
-   dir_contents <- readIORef v_Dep_dir_contents
-   ignore_dirs  <- readIORef v_Dep_ignore_dirs
-   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 (OtherError ("can't find one of the following: " ++
-				      unwords (map (\d -> '`': d ++ "'") deps) ++
-				      " (imported from `" ++ mod ++ "')"))
-     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
-   search dir_contents
-
+	-- 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
+  SysTools.copy "Installing new makefile" tmp_file makefile
+
+
+findDependency :: Bool -> FilePath -> ModuleName -> IO (Maybe (String, Bool))
+findDependency is_source src imp = do
+   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 ++ "'"))