[project @ 2001-06-28 15:45:49 by rrt]

[ghc-hetmet.git] / ghc / compiler / main / SysTools.lhs

diff --git a/ghc/compiler/main/SysTools.lhs b/ghc/compiler/main/SysTools.lhs
index 213254f..6b88692 100644 (file)
--- a/ghc/compiler/main/SysTools.lhs
+++ b/ghc/compiler/main/SysTools.lhs
@@ -56,7 +56,6 @@ import IOExts         ( IORef, readIORef, writeIORef )
 import Monad           ( when, unless )
 import System          ( system, ExitCode(..), exitWith )
 import CString
-import Addr
 import Int
 
 #if __GLASGOW_HASKELL__ < 500
@@ -70,10 +69,12 @@ import MarshalArray
 #if !defined(mingw32_TARGET_OS)
 import qualified Posix
 #else
-import Addr             ( nullAddr )
+import Addr
 import List            ( isPrefixOf )
 #endif
 
+import List            ( isSuffixOf )
+
 #include "HsVersions.h"
 
 {-# DEPRECATED runSomething "runSomething should be private to SysTools" #-}
@@ -203,7 +204,7 @@ initSysTools minusB_args
        ; config_exists <- doesFileExist pkgconfig_path
        ; when (not config_exists) $
             throwDyn (InstallationError 
-                        ("Can't find package.conf in " ++ pkgconfig_path))
+                        ("Can't find package.conf as " ++ pkgconfig_path))
 
 #if defined(mingw32_TARGET_OS)
        --              WINDOWS-SPECIFIC STUFF
@@ -307,7 +308,7 @@ setPgm pgm     = unknownFlagErr ("-pgm" ++ pgm)
 -- 1. Set proto_top_dir
 --     a) look for (the last) -B flag, and use it
 --     b) if there are no -B flags, get the directory 
---        where GHC is running
+--        where GHC is running (only on Windows)
 --
 -- 2. If package.conf exists in proto_top_dir, we are running
 --     installed; and TopDir = proto_top_dir
@@ -323,39 +324,39 @@ getTopDir :: [String]
                 String)        -- TopDir (in Unix format '/' separated)
 
 getTopDir minusbs
-  = do { top_dir1 <- get_proto
-       ; let top_dir2 = unDosifyPath top_dir1  -- Convert to standard internal form
-
-       -- Discover whether we're running in a build tree or in an installation,
+  = do { top_dir <- get_proto
+        -- Discover whether we're running in a build tree or in an installation,
        -- by looking for the package configuration file.
-       ; am_installed <- doesFileExist (top_dir2 `slash` "package.conf")
+       ; am_installed <- doesFileExist (top_dir `slash` "package.conf")
 
-       ; if am_installed then
-           return (True, top_dir2)
-        else
-           return (False, remove_suffix top_dir2)
+       ; return (am_installed, top_dir)
        }
   where
-    get_proto | not (null minusbs) 
-             = return (drop 2 (last minusbs))  -- 2 for "-B"
+    -- get_proto returns a Unix-format path
+    get_proto | not (null minusbs)
+             = return (unDosifyPath (drop 2 (last minusbs)))   -- 2 for "-B"
              | otherwise          
              = do { maybe_exec_dir <- getExecDir -- Get directory of executable
                   ; case maybe_exec_dir of       -- (only works on Windows; 
                                                  --  returns Nothing on Unix)
                        Nothing  -> throwDyn (InstallationError "missing -B<dir> option")
-                       Just dir -> return dir
+                       Just dir -> return (remove_suffix (unDosifyPath dir))
                   }
 
-    remove_suffix dir  -- "/...stuff.../ghc/compiler" --> "/...stuff..."
-       = ASSERT2( not (null p1) && 
-                  not (null p2) && 
-                  dir == top_dir ++ "/ghc/compiler",
-                  text dir )
-         top_dir
+    -- In an installed tree, the ghc binary lives in $libexecdir, which
+    -- is normally $libdir/bin.  So we strip off a /bin suffix here.
+    -- In a build tree, the ghc binary lives in $fptools/ghc/compiler,
+    -- so we strip off the /ghc/compiler suffix here too, leaving a
+    -- standard TOPDIR.
+    remove_suffix ghc_bin_dir  -- ghc_bin_dir is in standard Unix format
+       | "/ghc/compiler" `isSuffixOf` ghc_bin_dir      = back_two
+       | "/bin" `isSuffixOf` ghc_bin_dir               = back_one
+       | otherwise                                     = ghc_bin_dir
        where
-        p1      = dropWhile (not . isSlash) (reverse dir)
+        p1      = dropWhile (not . isSlash) (reverse ghc_bin_dir)
         p2      = dropWhile (not . isSlash) (tail p1)  -- head is '/'
-        top_dir = reverse (tail p2)                    -- head is '/'
+        back_two = reverse (tail p2)                   -- head is '/'
+        back_one = reverse (tail p1)
 \end{code}
 
 
@@ -405,7 +406,6 @@ touch purpose arg =  do p <- readIORef v_Pgm_T
 
 copy :: String -> String -> String -> IO ()
 copy purpose from to =
-#if defined(mingw32_TARGET_OS) && defined(MINIMAL_UNIX_DEPS)
     (do
       h <- openFile to WriteMode
       ls <- readFile from -- inefficient, but it'll do for now.
@@ -413,15 +413,6 @@ copy purpose from to =
       hPutStrLn h ls
       hClose h) `catchAllIO`
                 (\_ -> throwDyn (PhaseFailed purpose (ExitFailure 1)))
-#else
-    do
-    -- ToDo: switch away from using 'echo' altogether (but need
-    -- a faster alternative than what's done below).
-      SysTools.runSomething "Ineffective C pre-processor"
-                 ("echo '{-# LINE 1 \""  ++ input_fn ++ "\" #-}' > " 
-                 ++ output_fn ++ " && cat " ++ input_fn
-                 ++ " >> " ++ output_fn) []
-#endif
 \end{code}
 
 \begin{code}