X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FinstallPackage.hs;h=6e5914dfae7895d2d6eb5dfad094224455d2dd75;hb=8a95a7ebce828828aba12c1dbb7bad067e3535e9;hp=866b0e8c6dfea7bf81af8ae82fa5b3418766f561;hpb=8b3e3da73c7aab975e53e5b0cdb4e32c0abbb626;p=ghc-hetmet.git

diff --git a/libraries/installPackage.hs b/libraries/installPackage.hs
index 866b0e8..6e5914d 100644
--- a/libraries/installPackage.hs
+++ b/libraries/installPackage.hs
@@ -1,43 +1,56 @@
 
 import Distribution.PackageDescription
-import Distribution.Setup
 import Distribution.Simple
 import Distribution.Simple.Configure
 import Distribution.Simple.LocalBuildInfo
+import Distribution.Simple.Program
+import Distribution.Simple.Setup
+import Distribution.Simple.Utils
 import Distribution.Verbosity
 import System.Environment
 
 main :: IO ()
-main = do args <- getArgs
-          case args of
-              pref : ghcpkg : 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 pref ghcpkg verbosity
-              _ ->
-                  error "Missing arguments"
+main
+  = do args <- getArgs
+       case args of
+           ghcpkg : ghcpkgconf : destdir : topdir :
+                    iprefix : ibindir : ilibdir : ilibexecdir :
+                    idatadir : idocdir : ihtmldir :
+                    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
+           _ ->
+               error "Missing arguments"
 
-doit :: FilePath -> FilePath -> Verbosity -> IO ()
-doit pref ghcpkg verbosity =
+doit :: Verbosity -> FilePath -> FilePath -> FilePath -> FilePath
+     -> FilePath -> FilePath -> FilePath -> FilePath -> FilePath
+     -> FilePath -> FilePath
+     -> IO ()
+doit verbosity ghcpkg ghcpkgconf destdir topdir
+     iprefix ibindir ilibdir ilibexecdir idatadir idocdir ihtmldir =
        do let userHooks = simpleUserHooks
-              copyFlags = (emptyCopyFlags NoCopyDest) {
+              copyto = if null destdir then NoCopyDest else CopyTo destdir
+              copyFlags = (emptyCopyFlags copyto) {
                               copyVerbose = verbosity
                           }
               registerFlags = emptyRegisterFlags {
-                                  regUser = MaybeUserGlobal,
+                                  regPackageDB = Just GlobalPackageDB,
                                   regVerbose = verbosity,
                                   regGenScript = False,
-                                  regInPlace = False,
-                                  regWithHcPkg = Just ghcpkg
+                                  regInPlace = False
                               }
-          lbi <- getPersistBuildConfig
+          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
@@ -54,13 +67,55 @@ 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 }
+              toPathTemplate' = toPathTemplate . replaceTopdir topdir
+              i_copy = i { prefixDirTemplate  = toPathTemplate' iprefix,
+                           binDirTemplate     = toPathTemplate' ibindir,
+                           libDirTemplate     = toPathTemplate' ilibdir,
+                           libexecDirTemplate = toPathTemplate' ilibexecdir,
+                           dataDirTemplate    = toPathTemplate' idatadir,
+                           docDirTemplate     = toPathTemplate' idocdir,
+                           htmlDirTemplate    = toPathTemplate' ihtmldir
+                         }
+              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 = ["--force", "--global-conf", ghcpkgconf],
+                         programLocation = UserSpecified ghcpkg
+                     }
+              progs' = updateProgram prog progs
+              i_reg = i { prefixDirTemplate  = toPathTemplate iprefix,
+                          binDirTemplate     = toPathTemplate ibindir,
+                          libDirTemplate     = toPathTemplate ilibdir,
+                          libexecDirTemplate = toPathTemplate ilibexecdir,
+                          dataDirTemplate    = toPathTemplate idatadir,
+                          docDirTemplate     = toPathTemplate idocdir,
+                          htmlDirTemplate    = toPathTemplate ihtmldir
+                        }
+              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 ()
 
+replaceTopdir :: FilePath -> FilePath -> FilePath
+replaceTopdir topdir ('$':'t':'o':'p':'d':'i':'r':p) = topdir ++ p
+replaceTopdir _ p = p
+
+-- Get the build info, merging the setup-config and buildinfo files.
+getConfig :: Verbosity -> IO LocalBuildInfo
+getConfig verbosity = do
+    lbi <- getPersistBuildConfig
+    maybe_infoFile <- defaultHookedPackageDesc
+    case maybe_infoFile of
+        Nothing -> return lbi
+        Just infoFile -> do
+            hbi <- readHookedBuildInfo verbosity infoFile
+            return lbi { localPkgDescr = updatePackageDescription hbi (localPkgDescr lbi)}
+
+