X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FinstallPackage.hs;h=c091b0b7d1a4f91a752efa858a8161feda584db3;hp=dcba287ddff46567912754e96f325cc5a524a85a;hb=7ef211e8d6aed14f77b344d976e207bc77e365a7;hpb=2f181d8ddcd9a88f487a50d64ef682efd55da462

diff --git a/libraries/installPackage.hs b/libraries/installPackage.hs
index dcba287..c091b0b 100644
--- a/libraries/installPackage.hs
+++ b/libraries/installPackage.hs
@@ -1,16 +1,18 @@
 
 import Distribution.PackageDescription
+import Distribution.Program
 import Distribution.Setup
 import Distribution.Simple
 import Distribution.Simple.Configure
 import Distribution.Simple.LocalBuildInfo
-import Distribution.Simple.Utils
 import Distribution.Verbosity
 import System.Environment
 
 main :: IO ()
 main = do args <- getArgs
-          let verbosity = case args of
+          case args of
+              pref : ghcpkg : ghcpkgconf : args' ->
+                  let verbosity = case args' of
                               [] -> normal
                               ['-':'v':v] ->
                                   let m = case v of
@@ -18,43 +20,59 @@ main = do args <- getArgs
                                               _ -> Just v
                                   in flagToVerbosity m
                               _ -> error ("Bad arguments: " ++ show args)
-              userHooks = simpleUserHooks
-              installFlags = InstallFlags {
-                                 installUserFlags = MaybeUserGlobal,
-                                 installVerbose = verbosity
-                             }
-          pdFile <- defaultPackageDesc verbosity
-          pd <- readPackageDescription verbosity pdFile
+                  in doit pref ghcpkg ghcpkgconf verbosity
+              _ ->
+                  error "Missing arguments"
+
+doit :: FilePath -> FilePath -> FilePath -> Verbosity -> IO ()
+doit pref ghcpkg ghcpkgconf verbosity =
+       do let userHooks = simpleUserHooks
+              copyFlags = (emptyCopyFlags NoCopyDest) {
+                              copyVerbose = verbosity
+                          }
+              registerFlags = emptyRegisterFlags {
+                                  regUser = MaybeUserGlobal,
+                                  regVerbose = verbosity,
+                                  regGenScript = False,
+                                  regInPlace = False
+                              }
           lbi <- getPersistBuildConfig
-          let -- XXX This is an almighty hack, shadowing the base Setup.hs hack
-              lib' = case library pd of
-                         Just lib ->
-                             lib {
-                                 exposedModules = filter (("GHC.Prim" /=))
-                                                $ exposedModules lib
-                                 }
-                         Nothing ->
-                             error "Expected a library, but none found"
-              pd' = pd { library = Just lib' }
-              -- When installing we need to use the non-inplace ghc-pkg.
-              -- We also set the compiler to be non-inplace, but that
-              -- probably doesn't matter.
-              c = compiler lbi
-              c' = c { compilerPath = dropInPlace (compilerPath c),
-                       compilerPkgTool = dropInPlace (compilerPkgTool c)
+          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)) }
+              -- When coying, we need to actually give a concrete
+              -- directory to copy to rather than "$topdir"
+              i_copy = i { prefixDirTemplate = toPathTemplate pref }
+              lbi_copy = lbi { installDirTemplates = i_copy }
+              -- When we run GHC we give it a $topdir that includes the
+              -- $compiler/lib/ part of libsubdir, so we only want the
+              -- $pkgid part in the package.conf file. This is a bit of
+              -- a hack, really.
+              progs = withPrograms lbi
+              prog = ConfiguredProgram {
+                         programId = programName ghcPkgProgram,
+                         programVersion = Nothing,
+                         programArgs = ["--global-conf", ghcpkgconf],
+                         programLocation = UserSpecified ghcpkg
                      }
-              lbi' = lbi { compiler = c' }
-          (instHook simpleUserHooks) pd' lbi' userHooks installFlags
-
-dropInPlace :: FilePath -> FilePath
-dropInPlace "" = ""
-dropInPlace xs@(x:xs') = case dropPrefix "-inplace" xs of
-                             Nothing -> x : dropInPlace xs'
-                             Just xs'' -> dropInPlace xs''
-
-dropPrefix :: Eq a => [a] -> [a] -> Maybe [a]
-dropPrefix [] ys = Just ys
-dropPrefix (x:xs) (y:ys)
- | x == y = dropPrefix xs ys
-dropPrefix _ _ = Nothing
+              progs' = updateProgram prog progs
+              i_reg = i { libSubdirTemplate = toPathTemplate "$pkgid" }
+              lbi_reg = lbi { installDirTemplates = i_reg,
+                              withPrograms = progs' }
+          (copyHook simpleUserHooks) pd_copy lbi_copy userHooks copyFlags
+          (regHook simpleUserHooks)  pd_reg  lbi_reg  userHooks registerFlags
+          return ()