-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #55 from phadej/ghc-8.2b
Support GHC-8.2.1
- Loading branch information
Showing
7 changed files
with
71 additions
and
219 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,8 @@ | ||
| 0.3.7.1 | ||
| --- | ||
|
|
||
| * GHC-8.2 support | ||
|
|
||
| 0.3.7 | ||
| --- | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,165 +1,36 @@ | ||
| \begin{code} | ||
| {-# LANGUAGE CPP #-} | ||
| #ifndef MIN_VERSION_Cabal | ||
| #define MIN_VERSION_Cabal(x,y,z) 0 | ||
| #endif | ||
| #ifndef MIN_VERSION_directory | ||
| #define MIN_VERSION_directory(x,y,z) 0 | ||
| #endif | ||
| #if MIN_VERSION_Cabal(1,24,0) | ||
| #define InstalledPackageId UnitId | ||
| #endif | ||
| {-# OPTIONS_GHC -Wall #-} | ||
| module Main (main) where | ||
| import Control.Monad ( when ) | ||
| import Data.List ( nub ) | ||
| import Distribution.Package ( InstalledPackageId ) | ||
| import Distribution.Package ( PackageId, Package (..), packageVersion ) | ||
| import Distribution.PackageDescription ( PackageDescription(), TestSuite(..) , Library (..), BuildInfo (..)) | ||
| import Distribution.Simple ( defaultMainWithHooks, UserHooks(..), simpleUserHooks ) | ||
| import Distribution.Simple.Utils ( rewriteFile, createDirectoryIfMissingVerbose ) | ||
| import Distribution.Simple.BuildPaths ( autogenModulesDir ) | ||
| import Distribution.Simple.Setup ( BuildFlags(buildDistPref, buildVerbosity), fromFlag) | ||
| import Distribution.Simple.LocalBuildInfo ( withPackageDB, withLibLBI, withTestLBI, LocalBuildInfo(), ComponentLocalBuildInfo(componentPackageDeps), compiler ) | ||
| import Distribution.Simple.Compiler ( showCompilerId , PackageDB (..)) | ||
| import Distribution.Text ( display , simpleParse ) | ||
| import System.FilePath ( (</>) ) | ||
| #if MIN_VERSION_Cabal(1,25,0) | ||
| import Distribution.Simple.BuildPaths ( autogenComponentModulesDir ) | ||
| #ifndef MIN_VERSION_cabal_doctest | ||
| #define MIN_VERSION_cabal_doctest(x,y,z) 0 | ||
| #endif | ||
| #if MIN_VERSION_directory(1,2,2) | ||
| import System.Directory (makeAbsolute) | ||
| #else | ||
| import System.Directory (getCurrentDirectory) | ||
| import System.FilePath (isAbsolute) | ||
| makeAbsolute :: FilePath -> IO FilePath | ||
| makeAbsolute p | isAbsolute p = return p | ||
| | otherwise = do | ||
| cwd <- getCurrentDirectory | ||
| return $ cwd </> p | ||
| #endif | ||
| #if MIN_VERSION_cabal_doctest(1,0,0) | ||
| import Distribution.Extra.Doctest ( defaultMainWithDoctests ) | ||
| main :: IO () | ||
| main = defaultMainWithHooks simpleUserHooks | ||
| { buildHook = \pkg lbi hooks flags -> do | ||
| generateBuildModule flags pkg lbi | ||
| buildHook simpleUserHooks pkg lbi hooks flags | ||
| } | ||
| generateBuildModule :: BuildFlags -> PackageDescription -> LocalBuildInfo -> IO () | ||
| generateBuildModule flags pkg lbi = do | ||
| let verbosity = fromFlag (buildVerbosity flags) | ||
| let distPref = fromFlag (buildDistPref flags) | ||
| -- Package DBs | ||
| let dbStack = withPackageDB lbi ++ [ SpecificPackageDB $ distPref </> "package.conf.inplace" ] | ||
| let dbFlags = "-hide-all-packages" : packageDbArgs dbStack | ||
| withLibLBI pkg lbi $ \lib libcfg -> do | ||
| let libBI = libBuildInfo lib | ||
| -- modules | ||
| let modules = exposedModules lib ++ otherModules libBI | ||
| -- it seems that doctest is happy to take in module names, not actual files! | ||
| let module_sources = modules | ||
| main = defaultMainWithDoctests "doctests" | ||
| -- We need the directory with library's cabal_macros.h! | ||
| #if MIN_VERSION_Cabal(1,25,0) | ||
| let libAutogenDir = autogenComponentModulesDir lbi libcfg | ||
| #else | ||
| let libAutogenDir = autogenModulesDir lbi | ||
| #endif | ||
| -- Lib sources and includes | ||
| iArgs <- mapM (fmap ("-i"++) . makeAbsolute) $ libAutogenDir : hsSourceDirs libBI | ||
| includeArgs <- mapM (fmap ("-I"++) . makeAbsolute) $ includeDirs libBI | ||
| -- CPP includes, i.e. include cabal_macros.h | ||
| let cppFlags = map ("-optP"++) $ | ||
| [ "-include", libAutogenDir ++ "/cabal_macros.h" ] | ||
| ++ cppOptions libBI | ||
| -- Actually we need to check whether testName suite == "doctests" | ||
| -- pending https://github.com/haskell/cabal/pull/4229 getting into GHC HEAD tree | ||
| withTestLBI pkg lbi $ \suite suitecfg -> when (testName suite == testName suite) $ do | ||
| -- get and create autogen dir | ||
| #if MIN_VERSION_Cabal(1,25,0) | ||
| let testAutogenDir = autogenComponentModulesDir lbi suitecfg | ||
| #else | ||
| let testAutogenDir = autogenModulesDir lbi | ||
| #ifdef MIN_VERSION_Cabal | ||
| -- If the macro is defined, we have new cabal-install, | ||
| -- but for some reason we don't have cabal-doctest in package-db | ||
| -- | ||
| -- Probably we are running cabal sdist, when otherwise using new-build | ||
| -- workflow | ||
| #warning You are configuring this package without cabal-doctest installed. \ | ||
| The doctests test-suite will not work as a result. \ | ||
| To fix this, install cabal-doctest before configuring. | ||
| #endif | ||
| createDirectoryIfMissingVerbose verbosity True testAutogenDir | ||
| -- write autogen'd file | ||
| rewriteFile (testAutogenDir </> "Build_doctests.hs") $ unlines | ||
| [ "module Build_doctests where" | ||
| , "" | ||
| -- -package-id etc. flags | ||
| , "pkgs :: [String]" | ||
| , "pkgs = " ++ (show $ formatDeps $ testDeps libcfg suitecfg) | ||
| , "" | ||
| , "flags :: [String]" | ||
| , "flags = " ++ show (iArgs ++ includeArgs ++ dbFlags ++ cppFlags) | ||
| , "" | ||
| , "module_sources :: [String]" | ||
| , "module_sources = " ++ show (map display module_sources) | ||
| ] | ||
| where | ||
| -- we do this check in Setup, as then doctests don't need to depend on Cabal | ||
| isOldCompiler = maybe False id $ do | ||
| a <- simpleParse $ showCompilerId $ compiler lbi | ||
| b <- simpleParse "7.5" | ||
| return $ packageVersion (a :: PackageId) < b | ||
| import Distribution.Simple | ||
| formatDeps = map formatOne | ||
| formatOne (installedPkgId, pkgId) | ||
| -- The problem is how different cabal executables handle package databases | ||
| -- when doctests depend on the library | ||
| | packageId pkg == pkgId = "-package=" ++ display pkgId | ||
| | otherwise = "-package-id=" ++ display installedPkgId | ||
| -- From Distribution.Simple.Program.GHC | ||
| packageDbArgs :: [PackageDB] -> [String] | ||
| packageDbArgs | isOldCompiler = packageDbArgsConf | ||
| | otherwise = packageDbArgsDb | ||
| -- GHC <7.6 uses '-package-conf' instead of '-package-db'. | ||
| packageDbArgsConf :: [PackageDB] -> [String] | ||
| packageDbArgsConf dbstack = case dbstack of | ||
| (GlobalPackageDB:UserPackageDB:dbs) -> concatMap specific dbs | ||
| (GlobalPackageDB:dbs) -> ("-no-user-package-conf") | ||
| : concatMap specific dbs | ||
| _ -> ierror | ||
| where | ||
| specific (SpecificPackageDB db) = [ "-package-conf=" ++ db ] | ||
| specific _ = ierror | ||
| ierror = error $ "internal error: unexpected package db stack: " | ||
| ++ show dbstack | ||
| -- GHC >= 7.6 uses the '-package-db' flag. See | ||
| -- https://ghc.haskell.org/trac/ghc/ticket/5977. | ||
| packageDbArgsDb :: [PackageDB] -> [String] | ||
| -- special cases to make arguments prettier in common scenarios | ||
| packageDbArgsDb dbstack = case dbstack of | ||
| (GlobalPackageDB:UserPackageDB:dbs) | ||
| | all isSpecific dbs -> concatMap single dbs | ||
| (GlobalPackageDB:dbs) | ||
| | all isSpecific dbs -> "-no-user-package-db" | ||
| : concatMap single dbs | ||
| dbs -> "-clear-package-db" | ||
| : concatMap single dbs | ||
| where | ||
| single (SpecificPackageDB db) = [ "-package-db=" ++ db ] | ||
| single GlobalPackageDB = [ "-global-package-db" ] | ||
| single UserPackageDB = [ "-user-package-db" ] | ||
| isSpecific (SpecificPackageDB _) = True | ||
| isSpecific _ = False | ||
| main :: IO () | ||
| main = defaultMain | ||
| testDeps :: ComponentLocalBuildInfo -> ComponentLocalBuildInfo -> [(InstalledPackageId, PackageId)] | ||
| testDeps xs ys = nub $ componentPackageDeps xs ++ componentPackageDeps ys | ||
| #endif | ||
| \end{code} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| ----------------------------------------------------------------------------- | ||
| -- | | ||
| -- Module : Main (doctests) | ||
| -- Copyright : (C) 2012-14 Edward Kmett | ||
| -- License : BSD-style (see the file LICENSE) | ||
| -- Maintainer : Edward Kmett <ekmett@gmail.com> | ||
| -- Stability : provisional | ||
| -- Portability : portable | ||
| -- | ||
| -- This module provides doctests for a project based on the actual versions | ||
| -- of the packages it was built with. It requires a corresponding Setup.lhs | ||
| -- to be added to the project | ||
| ----------------------------------------------------------------------------- | ||
| module Main where | ||
|
|
||
| import Build_doctests (flags, pkgs, module_sources) | ||
| import Data.Foldable (traverse_) | ||
| import Test.DocTest | ||
|
|
||
| main :: IO () | ||
| main = do | ||
| traverse_ putStrLn args | ||
| doctest args | ||
| where | ||
| args = flags ++ pkgs ++ module_sources |