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

diff --git a/libraries/installPackage.hs b/libraries/installPackage.hs
index 5c83e7a..c091b0b 100644
--- a/libraries/installPackage.hs
+++ b/libraries/installPackage.hs
@@ -1,18 +1,17 @@
 
 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
-import System.Info
 
 main :: IO ()
 main = do args <- getArgs
           case args of
-              pref : ghcpkg : args' ->
+              pref : ghcpkg : ghcpkgconf : args' ->
                   let verbosity = case args' of
                               [] -> normal
                               ['-':'v':v] ->
@@ -21,45 +20,32 @@ main = do args <- getArgs
                                               _ -> Just v
                                   in flagToVerbosity m
                               _ -> error ("Bad arguments: " ++ show args)
-                  in doit pref ghcpkg verbosity
+                  in doit pref ghcpkg ghcpkgconf verbosity
               _ ->
                   error "Missing arguments"
 
-doit :: FilePath -> FilePath -> Verbosity -> IO ()
-doit pref ghcpkg verbosity =
+doit :: FilePath -> FilePath -> FilePath -> Verbosity -> IO ()
+doit pref ghcpkg ghcpkgconf verbosity =
        do let userHooks = simpleUserHooks
-              copyFlags = CopyFlags {
-                              copyDest = NoCopyDest,
+              copyFlags = (emptyCopyFlags NoCopyDest) {
                               copyVerbose = verbosity
                           }
-              registerFlags = RegisterFlags {
+              registerFlags = emptyRegisterFlags {
                                   regUser = MaybeUserGlobal,
+                                  regVerbose = verbosity,
                                   regGenScript = False,
-                                  regInPlace = False,
-                                  regWithHcPkg = Just ghcpkg,
-                                  regVerbose = verbosity
+                                  regInPlace = False
                               }
-          pdFile <- defaultPackageDesc verbosity
-          pd <- readPackageDescription verbosity pdFile
           lbi <- getPersistBuildConfig
-          let -- XXX These are almighty hacks, shadowing the base
-              -- Setup.hs hacks
-              extraExtraLibs = if (os == "mingw32") &&
-                                  (pkgName (package pd) == "base")
-                               then ["wsock32", "msvcrt", "kernel32",
-                                     "user32", "shell32"]
-                               else []
+          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
-                                   lib_bi = libBuildInfo lib
-                                   lib_bi' = lib_bi {
-                                                 extraLibs = extraExtraLibs
-                                                         ++ extraLibs lib_bi
-                                             }
                                in lib {
-                                      exposedModules = ems,
-                                      libBuildInfo = lib_bi'
+                                      exposedModules = ems
                                    }
                            Nothing ->
                                error "Expected a library, but none found"
@@ -69,12 +55,23 @@ doit pref ghcpkg verbosity =
               pd_reg  = pd { library = Just (mkLib (const True)) }
               -- When coying, we need to actually give a concrete
               -- directory to copy to rather than "$topdir"
-              lbi_copy = lbi { prefix = pref }
+              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.
-              lbi_reg = lbi { libsubdir = "$pkgid" }
+              progs = withPrograms lbi
+              prog = ConfiguredProgram {
+                         programId = programName ghcPkgProgram,
+                         programVersion = Nothing,
+                         programArgs = ["--global-conf", ghcpkgconf],
+                         programLocation = UserSpecified ghcpkg
+                     }
+              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 ()