[commit: ghc] wip/nfs-locking: Switch to using Distribution package for parsing cabal files. (f1249da)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/f1249daba280044fc478516d00db75689e128333/ghc

>---------------------------------------------------------------

commit f1249daba280044fc478516d00db75689e128333
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Aug 1 16:57:13 2015 +0100

    Switch to using Distribution package for parsing cabal files.


>---------------------------------------------------------------

f1249daba280044fc478516d00db75689e128333
 src/Settings/GhcCabal.hs | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/Settings/GhcCabal.hs b/src/Settings/GhcCabal.hs
index 2c475ab..a3d43f7 100644
--- a/src/Settings/GhcCabal.hs
+++ b/src/Settings/GhcCabal.hs
@@ -16,8 +16,11 @@ import Settings.User
 import Settings.Ways
 import Settings.Util
 import Settings.Packages
-import Data.List
-import Control.Applicative
+import Data.Version
+import qualified Distribution.Package                  as D
+import qualified Distribution.PackageDescription       as D
+import qualified Distribution.Verbosity                as D
+import qualified Distribution.PackageDescription.Parse as D
 
 cabalArgs :: Args
 cabalArgs = builder GhcCabal ? do
@@ -33,7 +36,7 @@ cabalArgs = builder GhcCabal ? do
             , libraryArgs
             , with HsColour
             , configureArgs
-            , stage0 ? packageConstraints
+            , packageConstraints
             , withStaged Gcc
             , notStage0 ? with Ld
             , with Ar
@@ -92,20 +95,19 @@ bootPackageDbArgs = do
 dllArgs :: Args
 dllArgs = arg ""
 
+-- TODO: speed up by caching the result in Shake database?
 packageConstraints :: Args
-packageConstraints = do
+packageConstraints = stage0 ? do
     pkgs <- getPackages
     constraints <- lift $ forM pkgs $ \pkg -> do
-        let cabal  = pkgPath pkg -/- pkgCabal pkg
-            prefix = dropExtension (pkgCabal pkg) ++ " == "
+        let cabal = pkgPath pkg -/- pkgCabal pkg
         need [cabal]
-        content <- lines <$> liftIO (readFile cabal)
-        let vs = filter (("ersion:" `isPrefixOf`) . drop 1) content
-        case vs of
-            [v] -> return $ prefix ++ dropWhile (not . isDigit) v
-            _   -> redError $ "Cannot determine package version in '"
-                            ++ cabal ++ "'."
-    append $ concatMap (\c -> ["--constraint", c]) $ constraints
+        description <- liftIO $ D.readPackageDescription D.silent cabal
+        let identifier         = D.package . D.packageDescription $ description
+            version            = showVersion . D.pkgVersion $ identifier
+            D.PackageName name = D.pkgName $ identifier
+        return $ name ++ " == " ++ version
+    append . concatMap (\c -> ["--constraint", c]) $ constraints
 
 -- TODO: should be in a different file
 -- TODO: put all validating options together in one file