X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FSysTools.lhs;h=0cba9d2968bc324050460a30ad8bb10b3c9d35f1;hb=42b6409dceccfa302b34b14fa3578db515f64eed;hp=71b729838f11d15bae62db9ffe3940b41d2fc74d;hpb=395917a05328e935f40abd080b169aa25546b083;p=ghc-hetmet.git diff --git a/ghc/compiler/main/SysTools.lhs b/ghc/compiler/main/SysTools.lhs index 71b7298..0cba9d2 100644 --- a/ghc/compiler/main/SysTools.lhs +++ b/ghc/compiler/main/SysTools.lhs @@ -1,6 +1,6 @@ ----------------------------------------------------------------------------- -- --- (c) The University of Glasgow 2001 +-- (c) The University of Glasgow 2001-2003 -- -- Access to system tools: gcc, cp, rm etc -- @@ -19,6 +19,7 @@ module SysTools ( setPgms, setPgma, setPgml, + setPgmDLL, #ifdef ILX setPgmI, setPgmi, @@ -28,6 +29,7 @@ module SysTools ( getTopDir, -- IO String -- The value of $libdir getPackageConfigPath, -- IO String -- Where package.conf is + getUsageMsgPaths, -- IO (String,String) -- Interface to system tools runUnlit, runCpp, runCc, -- [Option] -> IO () @@ -42,20 +44,18 @@ module SysTools ( touch, -- String -> String -> IO () copy, -- String -> String -> String -> IO () - unDosifyPath, -- String -> String + normalisePath, -- FilePath -> FilePath -- Temporary-file management setTmpDir, newTempName, - cleanTempFiles, cleanTempFilesExcept, removeTmpFiles, + cleanTempFiles, cleanTempFilesExcept, addFilesToClean, -- System interface - getProcessID, -- IO Int system, -- String -> IO ExitCode -- Misc - showGhcUsage, -- IO () Shows usage message and exits getSysMan, -- IO String Parallel system only Option(..) @@ -65,10 +65,11 @@ module SysTools ( #include "HsVersions.h" import DriverUtil +import DriverPhases ( isHaskellUserSrcFilename ) import Config import Outputable -import Panic ( progName, GhcException(..) ) -import Util ( global, notNull ) +import Panic ( GhcException(..) ) +import Util ( global, notNull, toArgs ) import CmdLineOpts ( dynFlag, verbosity ) import EXCEPTION ( throwDyn ) @@ -76,23 +77,24 @@ import DATA_IOREF ( IORef, readIORef, writeIORef ) import DATA_INT import Monad ( when, unless ) -import System ( ExitCode(..), exitWith, getEnv, system ) +import System ( ExitCode(..), getEnv, system ) import IO ( try, catch, - openFile, hPutChar, hPutStrLn, hPutStr, hClose, hFlush, IOMode(..), + openFile, hPutStrLn, hPutStr, hClose, hFlush, IOMode(..), stderr ) import Directory ( doesFileExist, removeFile ) +import List ( partition ) #include "../includes/config.h" -- GHC <= 4.08 didn't have rawSystem, and runs into problems with long command -- lines on mingw32, so we disallow it now. -#if defined(mingw32_HOST_OS) && (__GLASGOW_HASKELL__ <= 408) -#error GHC <= 4.08 is not supported for bootstrapping GHC on i386-unknown-mingw32 +#if __GLASGOW_HASKELL__ < 500 +#error GHC >= 5.00 is required for bootstrapping GHC #endif #ifndef mingw32_HOST_OS #if __GLASGOW_HASKELL__ > 504 -import qualified GHC.Posix +import qualified System.Posix.Internals #else import qualified Posix #endif @@ -103,16 +105,11 @@ import Foreign import CString ( CString, peekCString ) #endif -#ifdef mingw32_HOST_OS -#if __GLASGOW_HASKELL__ > 504 -import System.Cmd ( rawSystem ) +#if __GLASGOW_HASKELL__ < 603 +import Foreign ( withMany, withArray0, nullPtr, Ptr ) +import CForeign ( CString, withCString, throwErrnoIfMinus1 ) #else -import SystemExts ( rawSystem ) -#endif - -#else /* Not Win32 */ - -import System ( system ) +import System.Cmd ( rawSystem ) #endif \end{code} @@ -190,7 +187,7 @@ All these pathnames are maintained IN THE NATIVE FORMAT OF THE HOST MACHINE. \begin{code} GLOBAL_VAR(v_Pgm_L, error "pgm_L", String) -- unlit -GLOBAL_VAR(v_Pgm_P, error "pgm_P", String) -- cpp +GLOBAL_VAR(v_Pgm_P, error "pgm_P", (String,[Option])) -- cpp GLOBAL_VAR(v_Pgm_F, error "pgm_F", String) -- pp GLOBAL_VAR(v_Pgm_c, error "pgm_c", String) -- gcc GLOBAL_VAR(v_Pgm_m, error "pgm_m", String) -- asm code mangler @@ -207,7 +204,7 @@ GLOBAL_VAR(v_Pgm_T, error "pgm_T", String) -- touch GLOBAL_VAR(v_Pgm_CP, error "pgm_CP", String) -- cp GLOBAL_VAR(v_Path_package_config, error "path_package_config", String) -GLOBAL_VAR(v_Path_usage, error "ghc_usage.txt", String) +GLOBAL_VAR(v_Path_usages, error "ghc_usage.txt", (String,String)) GLOBAL_VAR(v_TopDir, error "TopDir", String) -- -B @@ -257,6 +254,10 @@ initSysTools minusB_args | am_installed = installed "ghc-usage.txt" | otherwise = inplace cGHC_DRIVER_DIR_REL "ghc-usage.txt" + ghci_usage_msg_path + | am_installed = installed "ghci-usage.txt" + | otherwise = inplace cGHC_DRIVER_DIR_REL "ghci-usage.txt" + -- For all systems, unlit, split, mangle are GHC utilities -- architecture-specific stuff is done when building Config.hs unlit_path @@ -282,30 +283,21 @@ initSysTools minusB_args -- On Win32, consult GetTempPath() for a temp dir. -- => it first tries TMP, TEMP, then finally the -- Windows directory(!). The directory is in short-path - -- form and *does* have a trailing backslash. + -- form. ; IO.try (do let len = (2048::Int) buf <- mallocArray len ret <- getTempPath len buf tdir <- if ret == 0 then do - -- failed, consult TEMP. + -- failed, consult TMPDIR. free buf - getEnv "TMP" + getEnv "TMPDIR" else do s <- peekCString buf free buf return s - let - -- strip the trailing backslash (awful, but - -- we only do this once). - tmpdir = - case last tdir of - '/' -> init tdir - '\\' -> init tdir - _ -> tdir - setTmpDir tmpdir - return ()) + setTmpDir tdir) #endif -- Check that the package config exists @@ -374,7 +366,9 @@ initSysTools minusB_args #endif -- cpp is derived from gcc on all platforms - ; let cpp_path = gcc_path ++ " -E " ++ cRAWCPP_FLAGS + -- HACK, see setPgmP below. We keep 'words' here to remember to fix + -- Config.hs one day. + ; let cpp_path = (gcc_path, (Option "-E"):(map Option (words cRAWCPP_FLAGS))) -- For all systems, copy and remove are provided by the host -- system; architecture-specific stuff is done when building Config.hs @@ -392,7 +386,8 @@ initSysTools minusB_args -- Initialise the global vars ; writeIORef v_Path_package_config pkgconfig_path - ; writeIORef v_Path_usage ghc_usage_msg_path + ; writeIORef v_Path_usages (ghc_usage_msg_path, + ghci_usage_msg_path) ; writeIORef v_Pgm_sysman (top_dir ++ "/ghc/rts/parallel/SysMan") -- Hans: this isn't right in general, but you can @@ -431,13 +426,16 @@ is used to override a particular program with a new one \begin{code} setPgmL = writeIORef v_Pgm_L -setPgmP = writeIORef v_Pgm_P +-- XXX HACK: Prelude> words "'does not' work" ===> ["'does","not'","work"] +-- Config.hs should really use Option. +setPgmP arg = let (pgm:args) = words arg in writeIORef v_Pgm_P (pgm,map Option args) setPgmF = writeIORef v_Pgm_F setPgmc = writeIORef v_Pgm_c setPgmm = writeIORef v_Pgm_m setPgms = writeIORef v_Pgm_s setPgma = writeIORef v_Pgm_a setPgml = writeIORef v_Pgm_l +setPgmDLL = writeIORef v_Pgm_MkDLL #ifdef ILX setPgmI = writeIORef v_Pgm_I setPgmi = writeIORef v_Pgm_i @@ -478,11 +476,11 @@ findTopDir minusbs ; return (am_installed, top_dir) } where - -- get_proto returns a Unix-format path (relying on getExecDir to do so too) + -- get_proto returns a Unix-format path (relying on getBaseDir to do so too) get_proto | notNull minusbs - = return (unDosifyPath (drop 2 (last minusbs))) -- 2 for "-B" + = return (normalisePath (drop 2 (last minusbs))) -- 2 for "-B" | otherwise - = do { maybe_exec_dir <- getExecDir -- Get directory of executable + = do { maybe_exec_dir <- getBaseDir -- Get directory of executable ; case maybe_exec_dir of -- (only works on Windows; -- returns Nothing on Unix) Nothing -> throwDyn (InstallationError "missing -B option") @@ -511,11 +509,9 @@ data Option String -- the filepath/filename portion | Option String -showOptions :: [Option] -> String -showOptions ls = unwords (map (quote.showOpt) ls) - where - showOpt (FileOption pre f) = pre ++ dosifyPath f - showOpt (Option s) = s +showOpt (FileOption pre f) = pre ++ platformPath f +showOpt (Option "") = "" +showOpt (Option s) = s \end{code} @@ -533,8 +529,8 @@ runUnlit args = do p <- readIORef v_Pgm_L runSomething "Literate pre-processor" p args runCpp :: [Option] -> IO () -runCpp args = do p <- readIORef v_Pgm_P - runSomething "C pre-processor" p args +runCpp args = do (p,baseArgs) <- readIORef v_Pgm_P + runSomething "C pre-processor" p (baseArgs ++ args) runPp :: [Option] -> IO () runPp args = do p <- readIORef v_Pgm_F @@ -596,23 +592,10 @@ getSysMan :: IO String -- How to invoke the system manager getSysMan = readIORef v_Pgm_sysman \end{code} -%************************************************************************ -%* * -\subsection{GHC Usage message} -%* * -%************************************************************************ - -Show the usage message and exit - \begin{code} -showGhcUsage = do { usage_path <- readIORef v_Path_usage - ; usage <- readFile usage_path - ; dump usage - ; exitWith ExitSuccess } - where - dump "" = return () - dump ('$':'$':s) = hPutStr stderr progName >> dump s - dump (c:s) = hPutChar stderr c >> dump s +getUsageMsgPaths :: IO (FilePath,FilePath) + -- the filenames of the usage messages (ghc, ghci) +getUsageMsgPaths = readIORef v_Path_usages \end{code} @@ -629,18 +612,49 @@ GLOBAL_VAR(v_TmpDir, cDEFAULT_TMPDIR, String ) \end{code} \begin{code} -setTmpDir dir = writeIORef v_TmpDir dir +setTmpDir dir = writeIORef v_TmpDir (canonicalise dir) + where +#if !defined(mingw32_HOST_OS) + canonicalise p = normalisePath p +#else + -- Canonicalisation of temp path under win32 is a bit more + -- involved: (a) strip trailing slash, + -- (b) normalise slashes + -- (c) just in case, if there is a prefix /cygdrive/x/, change to x: + -- + canonicalise path = normalisePath (xltCygdrive (removeTrailingSlash path)) + + -- if we're operating under cygwin, and TMP/TEMP is of + -- the form "/cygdrive/drive/path", translate this to + -- "drive:/path" (as GHC isn't a cygwin app and doesn't + -- understand /cygdrive paths.) + xltCygdrive path + | "/cygdrive/" `isPrefixOf` path = + case drop (length "/cygdrive/") path of + drive:xs@('/':_) -> drive:':':xs + _ -> path + | otherwise = path + + -- strip the trailing backslash (awful, but we only do this once). + removeTrailingSlash path = + case last path of + '/' -> init path + '\\' -> init path + _ -> path +#endif cleanTempFiles :: Int -> IO () -cleanTempFiles verb = do fs <- readIORef v_FilesToClean - removeTmpFiles verb fs +cleanTempFiles verb + = do fs <- readIORef v_FilesToClean + removeTmpFiles verb fs + writeIORef v_FilesToClean [] cleanTempFilesExcept :: Int -> [FilePath] -> IO () cleanTempFilesExcept verb dont_delete - = do fs <- readIORef v_FilesToClean - let leftovers = filter (`notElem` dont_delete) fs - removeTmpFiles verb leftovers - writeIORef v_FilesToClean dont_delete + = do files <- readIORef v_FilesToClean + let (to_keep, to_delete) = partition (`elem` dont_delete) files + removeTmpFiles verb to_delete + writeIORef v_FilesToClean to_keep -- find a temporary name that doesn't already exist. @@ -663,10 +677,25 @@ addFilesToClean files = mapM_ (add v_FilesToClean) files removeTmpFiles :: Int -> [FilePath] -> IO () removeTmpFiles verb fs - = traceCmd "Deleting temp files" - ("Deleting: " ++ unwords fs) - (mapM_ rm fs) + = warnNon $ + traceCmd "Deleting temp files" + ("Deleting: " ++ unwords deletees) + (mapM_ rm deletees) where + -- Flat out refuse to delete files that are likely to be source input + -- files (is there a worse bug than having a compiler delete your source + -- files?) + -- + -- Deleting source files is a sign of a bug elsewhere, so prominently flag + -- the condition. + warnNon act + | null non_deletees = act + | otherwise = do + hPutStrLn stderr ("WARNING - NOT deleting source files: " ++ unwords non_deletees) + act + + (non_deletees, deletees) = partition isHaskellUserSrcFilename fs + rm f = removeFile f `IO.catch` (\_ignored -> when (verb >= 2) $ @@ -698,22 +727,19 @@ runSomething :: String -- For -v message -- runSomething will dos-ify them -> IO () -runSomething phase_name pgm args - = traceCmd phase_name cmd_line $ - do { -#ifndef mingw32_HOST_OS - exit_code <- system cmd_line -#else - exit_code <- rawSystem cmd_line -#endif - ; if exit_code /= ExitSuccess - then throwDyn (PhaseFailed phase_name exit_code) - else return () - } - where - -- The pgm is already in native format (appropriate dir separators) - cmd_line = pgm ++ ' ':showOptions args - -- unwords (pgm : dosifyPaths (map quote args)) +runSomething phase_name pgm args = do + let real_args = filter notNull (map showOpt args) + -- Don't assume that 'pgm' contains the program path only, + -- but split it up and shift any arguments over to the arg vector. + let (real_pgm, argv) = + case toArgs pgm of + [] -> (pgm, real_args) -- let rawSystem be the bearer of bad news.. + (x:xs) -> (x, xs ++ real_args) + traceCmd phase_name (unwords (real_pgm : argv)) $ do + exit_code <- rawSystem real_pgm argv + if (exit_code /= ExitSuccess) + then throwDyn (PhaseFailed phase_name exit_code) + else return () traceCmd :: String -> String -> IO () -> IO () -- a) trace the command (at two levels of verbosity) @@ -733,8 +759,73 @@ traceCmd phase_name cmd_line action }} where handle_exn verb exn = do { when (verb >= 2) (hPutStr stderr "\n") - ; when (verb >= 3) (hPutStrLn stderr ("Failed: " ++ cmd_line)) + ; when (verb >= 3) (hPutStrLn stderr ("Failed: " ++ cmd_line ++ (show exn))) ; throwDyn (PhaseFailed phase_name (ExitFailure 1)) } + +-- ----------------------------------------------------------------------------- +-- rawSystem: run an external command +-- +-- In GHC 6.2.1 there's a correct implementation of rawSystem in the +-- library System.Cmd. If we are compiling with an earlier version of +-- GHC than this, we'd better have a copy of the correct implementation +-- right here. + +-- If you ever alter this code, you must alter +-- libraries/base/System/Cmd.hs +-- at the same time! There are also exensive comments in System.Cmd +-- thare are not repeated here -- go look! + + +#if __GLASGOW_HASKELL__ < 603 + +rawSystem :: FilePath -> [String] -> IO ExitCode + +#ifndef mingw32_TARGET_OS + +rawSystem cmd args = + withCString cmd $ \pcmd -> + withMany withCString (cmd:args) $ \cstrs -> + withArray0 nullPtr cstrs $ \arr -> do + status <- throwErrnoIfMinus1 "rawSystem" (c_rawSystem pcmd arr) + case status of + 0 -> return ExitSuccess + n -> return (ExitFailure n) + +foreign import ccall "rawSystem" unsafe + c_rawSystem :: CString -> Ptr CString -> IO Int + +#else + +-- On Windows, the command line is passed to the operating system as +-- a single string. Command-line parsing is done by the executable +-- itself. +rawSystem cmd args = do + -- NOTE: 'cmd' is assumed to contain the application to run _only_, + -- as it'll be quoted surrounded in quotes here. + let cmdline = translate cmd ++ concat (map ((' ':) . translate) args) + withCString cmdline $ \pcmdline -> do + status <- throwErrnoIfMinus1 "rawSystem" (c_rawSystem pcmdline) + case status of + 0 -> return ExitSuccess + n -> return (ExitFailure n) + +translate :: String -> String +-- Returns a string wrapped in double-quotes +-- If the input string starts with double-quote, don't touch it +-- If not, wrap it in double-quotes and double any backslashes +-- foo\baz --> "foo\\baz" +-- "foo\baz" --> "foo\baz" + +translate str@('"':_) = str -- already escaped. +translate str = '"' : foldr escape "\"" str + where escape '"' str = '\\' : '"' : str + escape c str = c : str + +foreign import ccall "rawSystem" unsafe + c_rawSystem :: CString -> IO Int + +#endif +#endif \end{code} @@ -749,21 +840,16 @@ the last moment. On Windows we dos-ify them just before passing them to the Windows command. The alternative, of using '/' consistently on Unix and '\' on Windows, -proved quite awkward. There were a lot more calls to dosifyPath, +proved quite awkward. There were a lot more calls to platformPath, and even on Windows we might invoke a unix-like utility (eg 'sh'), which interpreted a command line 'foo\baz' as 'foobaz'. \begin{code} ----------------------------------------------------------------------------- --- Convert filepath into MSDOS form. - -dosifyPaths :: [String] -> [String] --- dosifyPaths does two things --- a) change '/' to '\' --- b) remove initial '/cygdrive/' +-- Convert filepath into platform / MSDOS form. -unDosifyPath :: String -> String --- Just change '\' to '/' +normalisePath :: String -> String +-- Just changes '\' to '/' pgmPath :: String -- Directory string in Unix format -> String -- Program name with no directory separators @@ -773,36 +859,20 @@ pgmPath :: String -- Directory string in Unix format #if defined(mingw32_HOST_OS) - --------------------- Windows version ------------------ -dosifyPaths xs = map dosifyPath xs - -unDosifyPath xs = subst '\\' '/' xs - -pgmPath dir pgm = dosifyPath dir ++ '\\' : pgm +normalisePath xs = subst '\\' '/' xs +platformPath p = subst '/' '\\' p +pgmPath dir pgm = platformPath dir ++ '\\' : pgm -dosifyPath stuff - = subst '/' '\\' real_stuff - where - -- fully convince myself that /cygdrive/ prefixes cannot - -- really appear here. - cygdrive_prefix = "/cygdrive/" - - real_stuff - | cygdrive_prefix `isPrefixOf` stuff = dropList cygdrive_prefix stuff - | otherwise = stuff - +subst a b ls = map (\ x -> if x == a then b else x) ls #else - ---------------------- Unix version --------------------- -dosifyPaths ps = ps -unDosifyPath xs = xs -pgmPath dir pgm = dir ++ '/' : pgm -dosifyPath stuff = stuff +--------------------- Non-Windows version -------------- +normalisePath xs = xs +pgmPath dir pgm = dir ++ '/' : pgm +platformPath stuff = stuff -------------------------------------------------------- #endif -subst a b ls = map (\ x -> if x == a then b else x) ls \end{code} @@ -811,13 +881,6 @@ subst a b ls = map (\ x -> if x == a then b else x) ls \begin{code} slash :: String -> String -> String -absPath, relPath :: [String] -> String - -relPath [] = "" -relPath xs = foldr1 slash xs - -absPath xs = "" `slash` relPath xs - slash s1 s2 = s1 ++ ('/' : s2) \end{code} @@ -830,41 +893,36 @@ slash s1 s2 = s1 ++ ('/' : s2) \begin{code} ----------------------------------------------------------------------------- --- Define getExecDir :: IO (Maybe String) +-- Define getBaseDir :: IO (Maybe String) #if defined(mingw32_HOST_OS) -getExecDir :: IO (Maybe String) -getExecDir = do let len = (2048::Int) -- plenty, PATH_MAX is 512 under Win32. +getBaseDir :: IO (Maybe String) +-- Assuming we are running ghc, accessed by path $()/bin/ghc.exe, +-- return the path $(stuff). Note that we drop the "bin/" directory too. +getBaseDir = do let len = (2048::Int) -- plenty, PATH_MAX is 512 under Win32. buf <- mallocArray len ret <- getModuleFileName nullPtr buf len if ret == 0 then free buf >> return Nothing else do s <- peekCString buf free buf - return (Just (reverse (dropList "/bin/ghc.exe" (reverse (unDosifyPath s))))) - + return (Just (rootDir s)) + where + rootDir s = reverse (dropList "/bin/ghc.exe" (reverse (normalisePath s))) foreign import stdcall "GetModuleFileNameA" unsafe getModuleFileName :: Ptr () -> CString -> Int -> IO Int32 #else -getExecDir :: IO (Maybe String) = do return Nothing +getBaseDir :: IO (Maybe String) = do return Nothing #endif #ifdef mingw32_HOST_OS foreign import ccall "_getpid" unsafe getProcessID :: IO Int -- relies on Int == Int32 on Windows #elif __GLASGOW_HASKELL__ > 504 getProcessID :: IO Int -getProcessID = GHC.Posix.c_getpid >>= return . fromIntegral +getProcessID = System.Posix.Internals.c_getpid >>= return . fromIntegral #else getProcessID :: IO Int getProcessID = Posix.getProcessID #endif -quote :: String -> String -#if defined(mingw32_HOST_OS) -quote "" = "" -quote s = "\"" ++ s ++ "\"" -#else -quote s = s -#endif - \end{code}