X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FSysTools.lhs;h=f8818ba499e8058ff5510810586813189a9de4ac;hb=2cc5b907318f97e19b28b2ad8ed9ff8c1f401dcc;hp=56dd3fca2bc934ab2c7e50e42db17eac63b0cdfc;hpb=37b77e8a953abe50aaf303041213f51fe820fcd2;p=ghc-hetmet.git diff --git a/ghc/compiler/main/SysTools.lhs b/ghc/compiler/main/SysTools.lhs index 56dd3fc..f8818ba 100644 --- a/ghc/compiler/main/SysTools.lhs +++ b/ghc/compiler/main/SysTools.lhs @@ -1,5 +1,4 @@ ----------------------------------------------------------------------------- --- $Id: SysTools.lhs,v 1.52 2001/08/15 15:02:04 rrt Exp $ -- -- (c) The University of Glasgow 2001 -- @@ -20,6 +19,7 @@ module SysTools ( -- Interface to system tools runUnlit, runCpp, runCc, -- [Option] -> IO () + runPp, -- [Option] -> IO () runMangle, runSplit, -- [Option] -> IO () runAs, runLink, -- [Option] -> IO () runMkDLL, @@ -54,10 +54,15 @@ import DriverUtil import Config import Outputable import Panic ( progName, GhcException(..) ) -import Util ( global ) +import Util ( global, dropList ) import CmdLineOpts ( dynFlag, verbosity ) -import Exception ( throwDyn, catchAllIO ) +import Exception ( throwDyn ) +#if __GLASGOW_HASKELL__ > 408 +import qualified Exception ( catch ) +#else +import Exception ( catchAllIO ) +#endif import IO import Directory ( doesFileExist, removeFile ) import IOExts ( IORef, readIORef, writeIORef ) @@ -76,15 +81,35 @@ import List ( isPrefixOf ) import MarshalArray #endif +-- This is a kludge for bootstrapping with 4.08.X. Given that +-- all distributed compilers >= 5.0 will be compiled with themselves. +-- I don't think this kludge is a problem. And we have to start +-- building with >= 5.0 on Win32 anyway. +#if __GLASGOW_HASKELL__ > 408 -- use the line below when we can be sure of compiling with GHC >= -- 5.02, and remove the implementation of rawSystem at the end of this -- file +#if __GLASGOW_HASKELL__ >= 503 +import GHC.IOBase +#else import PrelIOBase -- this can be removed when SystemExts is used +#endif import CError ( throwErrnoIfMinus1 ) -- as can this -- import SystemExts ( rawSystem ) +#else +import System ( system ) +#endif + #include "HsVersions.h" +-- Make catch work on older GHCs +#if __GLASGOW_HASKELL__ > 408 +myCatch = Exception.catch +#else +myCatch = catchAllIO +#endif + \end{code} @@ -120,9 +145,9 @@ Config.hs contains two sorts of things etc They do *not* include paths - cUNLIT_DIR The *path* to the directory containing unlit, split etc - cSPLIT_DIR *relative* to the root of the build tree, - for use when running *in-place* in a build tree (only) + cUNLIT_DIR_REL The *path* to the directory containing unlit, split etc + cSPLIT_DIR_REL *relative* to the root of the build tree, + for use when running *in-place* in a build tree (only) @@ -162,6 +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_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 GLOBAL_VAR(v_Pgm_s, error "pgm_s", String) -- asm code splitter @@ -214,32 +240,33 @@ initSysTools minusB_args -- NB: top_dir is assumed to be in standard Unix format '/' separated ; let installed, installed_bin :: FilePath -> FilePath - installed_bin pgm = pgmPath (top_dir `slash` "extra-bin") pgm + installed_bin pgm = pgmPath top_dir pgm installed file = pgmPath top_dir file - inplace dir pgm = pgmPath (top_dir `slash` dir) pgm + inplace dir pgm = pgmPath (top_dir `slash` + cPROJECT_DIR `slash` dir) pgm ; let pkgconfig_path | am_installed = installed "package.conf" - | otherwise = inplace cGHC_DRIVER_DIR "package.conf.inplace" + | otherwise = inplace cGHC_DRIVER_DIR_REL "package.conf.inplace" ghc_usage_msg_path | am_installed = installed "ghc-usage.txt" - | otherwise = inplace cGHC_DRIVER_DIR "ghc-usage.txt" + | otherwise = inplace cGHC_DRIVER_DIR_REL "ghc-usage.txt" -- For all systems, unlit, split, mangle are GHC utilities -- architecture-specific stuff is done when building Config.hs unlit_path - | am_installed = installed_bin cGHC_UNLIT - | otherwise = inplace cGHC_UNLIT_DIR cGHC_UNLIT + | am_installed = installed_bin cGHC_UNLIT_PGM + | otherwise = inplace cGHC_UNLIT_DIR_REL cGHC_UNLIT_PGM -- split and mangle are Perl scripts split_script - | am_installed = installed_bin cGHC_SPLIT - | otherwise = inplace cGHC_SPLIT_DIR cGHC_SPLIT + | am_installed = installed_bin cGHC_SPLIT_PGM + | otherwise = inplace cGHC_SPLIT_DIR_REL cGHC_SPLIT_PGM mangle_script - | am_installed = installed_bin cGHC_MANGLER - | otherwise = inplace cGHC_MANGLER_DIR cGHC_MANGLER + | am_installed = installed_bin cGHC_MANGLER_PGM + | otherwise = inplace cGHC_MANGLER_DIR_REL cGHC_MANGLER_PGM #ifndef mingw32_TARGET_OS -- check whether TMPDIR is set in the environment @@ -247,6 +274,34 @@ initSysTools minusB_args setTmpDir dir return () ) +#else + -- 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. + ; IO.try (do + let len = (2048::Int) + buf <- mallocArray len + ret <- getTempPath len buf + tdir <- + if ret == 0 then do + -- failed, consult TEMP. + destructArray len buf + getEnv "TMP" + else do + s <- peekCString buf + destructArray len 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 ()) #endif -- Check that the package config exists @@ -284,8 +339,8 @@ initSysTools minusB_args | otherwise = cGHC_PERL -- 'touch' is a GHC util for Windows, and similarly unlit, mangle - ; let touch_path | am_installed = installed_bin cGHC_TOUCHY - | otherwise = inplace cGHC_TOUCHY_DIR cGHC_TOUCHY + ; let touch_path | am_installed = installed_bin cGHC_TOUCHY_PGM + | otherwise = inplace cGHC_TOUCHY_DIR_REL cGHC_TOUCHY_PGM -- On Win32 we don't want to rely on #!/bin/perl, so we prepend -- a call to Perl to get the invocation of split and mangle @@ -299,7 +354,7 @@ initSysTools minusB_args -- in the same place whether we are running "in-place" or "installed" -- That place is wherever the build-time configure script found them. ; let gcc_path = cGCC - touch_path = cGHC_TOUCHY + touch_path = "touch" mkdll_path = panic "Can't build DLLs on a non-Win32 system" -- On Unix, scripts are invoked using the '#!' method. Binary @@ -337,6 +392,7 @@ initSysTools minusB_args ; writeIORef v_Pgm_L unlit_path ; writeIORef v_Pgm_P cpp_path + ; writeIORef v_Pgm_F "" ; writeIORef v_Pgm_c gcc_path ; writeIORef v_Pgm_m mangle_path ; writeIORef v_Pgm_s split_path @@ -352,6 +408,10 @@ initSysTools minusB_args ; return () } + +#if defined(mingw32_TARGET_OS) +foreign import stdcall "GetTempPathA" getTempPath :: Int -> CString -> IO Int32 +#endif \end{code} setPgm is called when a command-line option like @@ -364,6 +424,7 @@ setPgm :: String -> IO () -- So the first character says which program to override setPgm ('P' : pgm) = writeIORef v_Pgm_P pgm +setPgm ('F' : pgm) = writeIORef v_Pgm_F pgm setPgm ('c' : pgm) = writeIORef v_Pgm_c pgm setPgm ('m' : pgm) = writeIORef v_Pgm_m pgm setPgm ('s' : pgm) = writeIORef v_Pgm_s pgm @@ -436,16 +497,17 @@ between filepaths and 'other stuff'. [The reason being, of course, that this type gives us a handle on transforming filenames, and filenames only, to whatever format they're expected to be on a particular platform.] - \begin{code} data Option - = FileOption String + = FileOption -- an entry that _contains_ filename(s) / filepaths. + String -- a non-filepath prefix that shouldn't be transformed (e.g., "/out=" + String -- the filepath/filename portion | Option String showOptions :: [Option] -> String showOptions ls = unwords (map (quote.showOpt) ls) where - showOpt (FileOption f) = dosifyPath f + showOpt (FileOption pre f) = pre ++ dosifyPath f showOpt (Option s) = s #if defined(mingw32_TARGET_OS) @@ -461,7 +523,7 @@ showOptions ls = unwords (map (quote.showOpt) ls) %************************************************************************ %* * \subsection{Running an external program} -n%* * +%* * %************************************************************************ @@ -474,6 +536,10 @@ runCpp :: [Option] -> IO () runCpp args = do p <- readIORef v_Pgm_P runSomething "C pre-processor" p args +runPp :: [Option] -> IO () +runPp args = do p <- readIORef v_Pgm_F + runSomething "Haskell pre-processor" p args + runCc :: [Option] -> IO () runCc args = do p <- readIORef v_Pgm_c runSomething "C Compiler" p args @@ -495,11 +561,11 @@ runLink args = do p <- readIORef v_Pgm_l runSomething "Linker" p args #ifdef ILX -runIlx2il :: [String] -> IO () +runIlx2il :: [Option] -> IO () runIlx2il args = do p <- readIORef v_Pgm_I runSomething "Ilx2Il" p args -runIlasm :: [String] -> IO () +runIlasm :: [Option] -> IO () runIlasm args = do p <- readIORef v_Pgm_i runSomething "Ilasm" p args #endif @@ -510,7 +576,7 @@ runMkDLL args = do p <- readIORef v_Pgm_MkDLL touch :: String -> String -> IO () touch purpose arg = do p <- readIORef v_Pgm_T - runSomething purpose p [FileOption arg] + runSomething purpose p [FileOption "" arg] copy :: String -> String -> String -> IO () copy purpose from to = do @@ -601,7 +667,7 @@ removeTmpFiles verb fs ("Deleting: " ++ unwords fs) (mapM_ rm fs) where - rm f = removeFile f `catchAllIO` + rm f = removeFile f `myCatch` (\_ignored -> when (verb >= 2) $ hPutStrLn stderr ("Warning: deleting non-existent " ++ f) @@ -668,7 +734,7 @@ traceCmd phase_name cmd_line action ; unless n $ do { -- And run it! - ; action `catchAllIO` handle_exn verb + ; action `myCatch` handle_exn verb }} where handle_exn verb exn = do { when (verb >= 2) (hPutStr stderr "\n") @@ -720,11 +786,6 @@ unDosifyPath xs = subst '\\' '/' xs pgmPath dir pgm = dosifyPath dir ++ '\\' : pgm --- HACK! -dosifyPath "\"/DLL\"" = "\"/DLL\"" -dosifyPath "\"/QUIET\"" = "\"/QUIET\"" -dosifyPath l@('"':'/':'O':'U':'T':_) = l --- end of HACK! dosifyPath stuff = subst '/' '\\' real_stuff where @@ -733,7 +794,7 @@ dosifyPath stuff cygdrive_prefix = "/cygdrive/" real_stuff - | cygdrive_prefix `isPrefixOf` stuff = drop (length cygdrive_prefix) stuff + | cygdrive_prefix `isPrefixOf` stuff = dropList cygdrive_prefix stuff | otherwise = stuff #else @@ -757,9 +818,6 @@ subst a b ls = map (\ x -> if x == a then b else x) ls slash :: String -> String -> String absPath, relPath :: [String] -> String -isSlash '/' = True -isSlash other = False - relPath [] = "" relPath xs = foldr1 slash xs @@ -781,16 +839,16 @@ slash s1 s2 = s1 ++ ('/' : s2) #if defined(mingw32_TARGET_OS) getExecDir :: IO (Maybe String) -getExecDir = do let len = 2048 -- plenty, PATH_MAX is 512 under Win32. - buf <- mallocArray (fromIntegral len) +getExecDir = do let len = (2048::Int) -- plenty, PATH_MAX is 512 under Win32. + buf <- mallocArray len ret <- getModuleFileName nullAddr buf len - if ret == 0 then return Nothing + if ret == 0 then destructArray len buf >> return Nothing else do s <- peekCString buf - destructArray (fromIntegral len) buf - return (Just (reverse (drop (length "/bin/ghc.exe") (reverse (unDosifyPath s))))) + destructArray len buf + return (Just (reverse (dropList "/bin/ghc.exe" (reverse (unDosifyPath s))))) -foreign import stdcall "GetModuleFileNameA" getModuleFileName :: Addr -> CString -> Int32 -> IO Int32 +foreign import stdcall "GetModuleFileNameA" getModuleFileName :: Addr -> CString -> Int -> IO Int32 #else getExecDir :: IO (Maybe String) = do return Nothing #endif @@ -803,6 +861,7 @@ getProcessID = Posix.getProcessID #endif rawSystem :: String -> IO ExitCode +#if __GLASGOW_HASKELL__ > 408 rawSystem "" = ioException (IOError Nothing InvalidArgument "rawSystem" "null command" Nothing) rawSystem cmd = withCString cmd $ \s -> do @@ -812,5 +871,9 @@ rawSystem cmd = n -> return (ExitFailure n) foreign import ccall "rawSystemCmd" unsafe primRawSystem :: CString -> IO Int +#else +rawSystem = System.system +#endif + \end{code}