User ghc's cProjectVersionInt to get version information

Language/Haskell/GhcMod/GhcPkg.hs

@@ -21,6 +21,11 @@ import Data.List (isPrefixOf, tails)
 import System.FilePath ((</>), takeFileName)
 import System.Process (readProcess)
 
+import Config (cProjectVersionInt) -- ghc version
+
+ghcVersion :: Int
+ghcVersion = read cProjectVersionInt
+
 -- | Get path to sandbox package db
 getSandboxDb :: FilePath -- ^ Path to the cabal package root directory
                          -- (containing the @cabal.sandbox.config@ file)
@@ -87,43 +92,21 @@ ghcDbStackOpts :: [GhcPkgDb] -- ^ Package db stack
                   -> [String]
 ghcDbStackOpts dbs = (ghcDbOpt `concatMap` dbs)
 
-
 ghcPkgDbOpt :: GhcPkgDb -> [String]
 ghcPkgDbOpt GlobalDb = ["--global"]
 ghcPkgDbOpt UserDb   = ["--user"]
-ghcPkgDbOpt (PackageDb pkgDb) =
+ghcPkgDbOpt (PackageDb pkgDb)
-    [noUserPkgDbOpt, pkgDbOpt]
+    | ghcVersion < 706 = ["--no-user-package-conf", "--package-conf=" ++ pkgDb]
-  where
+    | otherwise = ["--no-user-package-db",   "--package-db="   ++ pkgDb]
-    ver = extractGhcVer pkgDb
-    (noUserPkgDbOpt,pkgDbOpt)
-      | ver < 706 = ("--no-user-package-conf", "--package-conf=" ++ pkgDb)
-      | otherwise = ("--no-user-package-db",   "--package-db="   ++ pkgDb)
 
 ghcDbOpt :: GhcPkgDb -> [String]
-ghcDbOpt GlobalDb = ["-global-package-db"]
+ghcDbOpt GlobalDb | ghcVersion < 706 = ["-global-package-conf"]
-ghcDbOpt UserDb   = ["-user-package-db"]
+                  | otherwise = ["-global-package-db"]
-ghcDbOpt (PackageDb pkgDb) =
+ghcDbOpt UserDb   | ghcVersion < 706 = ["-user-package-conf"]
-    [noUserPkgDbOpt, pkgDbOpt, pkgDb]
+                  | otherwise = ["-user-package-db"]
-  where
+ghcDbOpt (PackageDb pkgDb)
-    ver = extractGhcVer pkgDb
+    | ghcVersion < 706 = ["-no-user-package-conf", "-package-conf", pkgDb]
-    (noUserPkgDbOpt,pkgDbOpt)
+    | otherwise = ["-no-user-package-db",   "-package-db",   pkgDb]
-      | ver < 706 = ("-no-user-package-conf", "-package-conf")
-      | otherwise = ("-no-user-package-db",   "-package-db")
-
--- | Extracting GHC version from the path of package db.
---   Exception is thrown if the string argument is incorrect.
---
--- >>> extractGhcVer "/foo/bar/i386-osx-ghc-7.6.3-packages.conf.d"
--- 706
-extractGhcVer :: String -> Int
-extractGhcVer dir = ver
-  where
-    file = takeFileName dir
-    findVer = drop 4 . head . filter ("ghc-" `isPrefixOf`) . tails
-    (verStr1,_:left) = break (== '.') $ findVer file
-    (verStr2,_)      = break (== '.') left
-    ver = read verStr1 * 100 + read verStr2
-
 
 -- getPackageDbPackages :: FilePath -> IO [Package]
 -- getPackageDbPackages cdir = (getPkgDb >>= listDbPackages) `E.catch` handler

test/CabalApiSpec.hs

@@ -14,6 +14,12 @@ import System.FilePath
 
 import Dir
 
+import Config (cProjectVersionInt) -- ghc version
+
+ghcVersion :: Int
+ghcVersion = read cProjectVersionInt
+
+
 spec :: Spec
 spec = do
     describe "parseCabalFile" $ do
@@ -31,7 +37,9 @@ spec = do
                         ghcOptions  = ghcOptions res
                       , includeDirs = map (toRelativeDir dir) (includeDirs res)
                       }
-                res' `shouldBe` CompilerOptions {ghcOptions = ["-global-package-db", "-no-user-package-db","-package-db",cwd </> "test/data/.cabal-sandbox/i386-osx-ghc-7.6.3-packages.conf.d","-XHaskell98"], includeDirs = ["test/data","test/data/dist/build","test/data/dist/build/autogen","test/data/subdir1/subdir2","test/data/test"], depPackages = [("Cabal", Nothing), ("base", Nothing) , ("template-haskell", Nothing)]}
+                if ghcVersion < 706
+                  then res' `shouldBe` CompilerOptions {ghcOptions = ["-global-package-conf", "-no-user-package-conf","-package-conf",cwd </> "test/data/.cabal-sandbox/i386-osx-ghc-7.6.3-packages.conf.d","-XHaskell98"], includeDirs = ["test/data","test/data/dist/build","test/data/dist/build/autogen","test/data/subdir1/subdir2","test/data/test"], depPackages = [("Cabal", Nothing), ("base", Nothing) , ("template-haskell", Nothing)]}
+                  else res' `shouldBe` CompilerOptions {ghcOptions = ["-global-package-db", "-no-user-package-db","-package-db",cwd </> "test/data/.cabal-sandbox/i386-osx-ghc-7.6.3-packages.conf.d","-XHaskell98"], includeDirs = ["test/data","test/data/dist/build","test/data/dist/build/autogen","test/data/subdir1/subdir2","test/data/test"], depPackages = [("Cabal", Nothing), ("base", Nothing) , ("template-haskell", Nothing)]}
 
 
     describe "cabalDependPackages" $ do