X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FifBuildable.hs;h=3f8813b63d66d7401c582d182f16a0f8e4e6723f;hp=3119aeefb74a21bcfd445f462c66a2124c99f047;hb=d7d755865a3849be26a468a3fa430ff96c8e9e0c;hpb=245094404c787dabdec878c8ea4ce9fc4e9fb9e4

diff --git a/libraries/ifBuildable.hs b/libraries/ifBuildable.hs
index 3119aee..3f8813b 100644
--- a/libraries/ifBuildable.hs
+++ b/libraries/ifBuildable.hs
@@ -1,8 +1,9 @@
+-- Returns exitcode 0 if the given package is buildable or is a boot package,
+-- and 1 otherwise.
 
 module Main (main) where
 
 import Control.Monad
-import System.Cmd
 import System.Directory
 import System.Environment
 import System.Exit
@@ -11,27 +12,25 @@ import System.IO
 main :: IO ()
 main = do args <- getArgs
           case args of
-              [] ->
-                  error "No package or command given"
-              [_] ->
-                  error "No command given"
-              package : prog : progArgs ->
-                  doit package prog progArgs
+              [bootPackagesFile, package] ->
+                  doit bootPackagesFile package
+              _ ->
+                  error "Syntax: ifBuildable <boot-packages-file> <package>"
 
-doit :: String -> String -> [String] -> IO ()
-doit package prog progArgs
+doit :: FilePath -> String -> IO ()
+doit bootPackagesFile package
  = do setCurrentDirectory package
       unbuildable <- doesFileExist "unbuildable"
-      if unbuildable
-         then do mustBeBuildables <- getMustBeBuildablePackages
+      if not unbuildable
+         then exitWith ExitSuccess
+         else do mustBeBuildables <- getMustBeBuildables bootPackagesFile
                  if package `elem` mustBeBuildables
-                     then error (package ++ " is unbuildable")
-                     else hPutStrLn stderr "Warning: Package is unbuildable"
-         else do ec <- rawSystem prog progArgs
-                 exitWith ec
+                     then exitWith ExitSuccess
+                     else do hPutStrLn stderr "Warning: Package is unbuildable"
+                             exitWith (ExitFailure 1)
 
-getMustBeBuildablePackages :: IO [String]
-getMustBeBuildablePackages
- = do xs <- readFile "../core-packages"
-      return $ filter ("readline" /=) $ lines xs
+getMustBeBuildables :: FilePath -> IO [String]
+getMustBeBuildables bootPackagesFile
+ = do xs <- readFile bootPackagesFile
+      return $ filter ("editline" /=) $ lines xs