Make HscTypes.tyThingId respond not panic on ADataCon

[ghc-hetmet.git] / libraries / installPackage.hs

diff --git a/libraries/installPackage.hs b/libraries/installPackage.hs
index 4f5b5ba..decf2d4 100644 (file)
--- a/libraries/installPackage.hs
+++ b/libraries/installPackage.hs
@@ -13,29 +13,50 @@ main :: IO ()
 main
   = do args <- getArgs
        case args of
-           ghcpkg : ghcpkgconf : destdir : topdir :
+           "register" : "--inplace" :args' ->
+               let verbosity = mkVerbosity args'
+               in doRegisterInplace verbosity
+           "install" : ghcpkg : ghcpkgconf : destdir : topdir :
                     iprefix : ibindir : ilibdir : ilibexecdir :
                     idatadir : idocdir : ihtmldir : iinterfacedir :
                     args' ->
-               let verbosity = case args' of
-                           [] -> normal
-                           ['-':'v':v] ->
-                               let m = case v of
-                                           "" -> Nothing
-                                           _ -> Just v
-                               in flagToVerbosity m
-                           _ -> error ("Bad arguments: " ++ show args)
-               in doit verbosity ghcpkg ghcpkgconf destdir topdir
-                       iprefix ibindir ilibdir ilibexecdir idatadir
-                       idocdir ihtmldir iinterfacedir
+               let verbosity = mkVerbosity args'
+               in doInstall verbosity ghcpkg ghcpkgconf destdir topdir
+                            iprefix ibindir ilibdir ilibexecdir idatadir
+                            idocdir ihtmldir iinterfacedir
            _ ->
-               error "Missing arguments"
+               error ("Bad arguments: " ++ show args)
 
-doit :: Verbosity -> FilePath -> FilePath -> FilePath -> FilePath
-     -> FilePath -> FilePath -> FilePath -> FilePath -> FilePath
-     -> FilePath -> FilePath -> FilePath
-     -> IO ()
-doit verbosity ghcpkg ghcpkgconf destdir topdir
+mkVerbosity :: [String] -> Verbosity
+mkVerbosity [] = normal
+mkVerbosity ['-':'v':v] = let m = case v of
+                                      "" -> Nothing
+                                      _ -> Just v
+                          in flagToVerbosity m
+mkVerbosity args = error ("Bad arguments: " ++ show args)
+
+doRegisterInplace :: Verbosity -> IO ()
+doRegisterInplace verbosity =
+       do lbi <- getConfig verbosity
+          let registerFlags = emptyRegisterFlags { regInPlace = True }
+              pd = localPkgDescr lbi
+              pd_reg = if pkgName (package pd) == "base"
+                       then case library pd of
+                            Just lib ->
+                                let ems = "GHC.Prim" : exposedModules lib
+                                    lib' = lib { exposedModules = ems }
+                                in pd { library = Just lib' }
+                            Nothing ->
+                                error "Expected a library, but none found"
+                       else pd
+          (regHook simpleUserHooks) pd_reg lbi simpleUserHooks registerFlags
+          return ()
+
+doInstall :: Verbosity -> FilePath -> FilePath -> FilePath -> FilePath
+          -> FilePath -> FilePath -> FilePath -> FilePath -> FilePath
+          -> FilePath -> FilePath -> FilePath
+          -> IO ()
+doInstall verbosity ghcpkg ghcpkgconf destdir topdir
      iprefix ibindir ilibdir ilibexecdir idatadir
      idocdir ihtmldir iinterfacedir =
        do let userHooks = simpleUserHooks
@@ -52,20 +73,18 @@ doit verbosity ghcpkg ghcpkgconf destdir topdir
           lbi <- getConfig verbosity
           let pd = localPkgDescr lbi
               i = installDirTemplates lbi
-              -- XXX This is an almighty hack, shadowing the base
-              -- Setup.hs hack
-              mkLib filt = case library pd of
-                           Just lib ->
-                               let ems = filter filt $ exposedModules lib
-                               in lib {
-                                      exposedModules = ems
-                                   }
-                           Nothing ->
-                               error "Expected a library, but none found"
-              -- There's no files for GHC.Prim, so we will fail if we
-              -- try to copy them
-              pd_copy = pd { library = Just (mkLib ("GHC.Prim" /=)) }
-              pd_reg  = pd { library = Just (mkLib (const True)) }
+              -- This is an almighty hack. We need to register
+              -- base:GHC.Prim, but it doesn't exist, get built, get
+              -- haddocked, get copied, etc.
+              pd_reg = if pkgName (package pd) == "base"
+                       then case library pd of
+                            Just lib ->
+                                let ems = "GHC.Prim" : exposedModules lib
+                                    lib' = lib { exposedModules = ems }
+                                in pd { library = Just lib' }
+                            Nothing ->
+                                error "Expected a library, but none found"
+                       else pd
               -- When coying, we need to actually give a concrete
               -- directory to copy to rather than "$topdir"
               toPathTemplate' = toPathTemplate . replaceTopdir topdir
@@ -102,8 +121,8 @@ doit verbosity ghcpkg ghcpkgconf destdir topdir
                         }
               lbi_reg = lbi { installDirTemplates = i_reg,
                               withPrograms = progs' }
-          (copyHook simpleUserHooks) pd_copy lbi_copy userHooks copyFlags
-          (regHook simpleUserHooks)  pd_reg  lbi_reg  userHooks registerFlags
+          (copyHook simpleUserHooks) pd     lbi_copy userHooks copyFlags
+          (regHook simpleUserHooks)  pd_reg lbi_reg  userHooks registerFlags
           return ()
 
 replaceTopdir :: FilePath -> FilePath -> FilePath