forked from haskell/cabal
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Decouple lib:Cabal version used by custom-setup from the lib component
This might require more refinement in future and is a first iteration trying to address haskell#5916
- Loading branch information
Showing
6 changed files
with
170 additions
and
87 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,78 @@ | ||
| {-# LANGUAGE Haskell2010 #-} | ||
| module Main (main) where | ||
|
|
||
| import Distribution.Backpack | ||
| import Distribution.Simple | ||
| import Distribution.Simple.BuildPaths | ||
| import Distribution.Simple.LocalBuildInfo | ||
| import Distribution.Simple.Setup | ||
| import Distribution.Simple.Utils | ||
| import Distribution.Types.LocalBuildInfo | ||
| import Distribution.Types.ModuleRenaming | ||
| import Distribution.Types.UnqualComponentName | ||
|
|
||
| import System.Directory | ||
| import System.FilePath | ||
|
|
||
| main :: IO () | ||
| main = defaultMain | ||
|
|
||
| -- Although this looks like the Simple build type, it is in fact vital that | ||
| -- we use this Setup.hs because we need to compile against the very same | ||
| -- version of the Cabal library that the test suite will be compiled | ||
| -- against. When this happens, it will mean that we'll be able to | ||
| -- read the LocalBuildInfo of our build environment, which we will | ||
| -- subsequently use to make decisions about PATHs etc. Important! | ||
| main = defaultMainWithHooks simpleUserHooks | ||
| { buildHook = \pkg lbi hooks flags -> do | ||
| generateScriptEnvModule lbi flags | ||
| buildHook simpleUserHooks pkg lbi hooks flags | ||
| } | ||
|
|
||
| generateScriptEnvModule :: LocalBuildInfo -> BuildFlags -> IO () | ||
| generateScriptEnvModule lbi flags = do | ||
| lbiPackageDbStack <- mapM canonicalizePackageDB (withPackageDB lbi) | ||
|
|
||
| createDirectoryIfMissing True moduledir | ||
| rewriteFileEx verbosity (moduledir </> "ScriptEnv0.hs") $ unlines | ||
| [ "module Test.Cabal.ScriptEnv0 where" | ||
| , "" | ||
| , "import Distribution.Simple" | ||
| , "import Distribution.System (Platform(..), Arch(..), OS(..))" | ||
| , "import Distribution.Types.ModuleRenaming" | ||
| , "import Distribution.Simple.Program.Db" | ||
| , "import Distribution.Backpack (OpenUnitId)" | ||
| , "import Data.Map (fromList)" | ||
| , "" | ||
| , "lbiPackageDbStack :: PackageDBStack" | ||
| , "lbiPackageDbStack = " ++ show lbiPackageDbStack | ||
| , "" | ||
| , "lbiPlatform :: Platform" | ||
| , "lbiPlatform = " ++ show (hostPlatform lbi) | ||
| , "" | ||
| , "lbiCompiler :: Compiler" | ||
| , "lbiCompiler = " ++ show (compiler lbi) | ||
| , "" | ||
| , "lbiPackages :: [(OpenUnitId, ModuleRenaming)]" | ||
| , "lbiPackages = read " ++ show (show (cabalTestsPackages lbi)) | ||
| , "" | ||
| , "lbiProgramDb :: ProgramDb" | ||
| , "lbiProgramDb = read " ++ show (show (withPrograms lbi)) | ||
| , "" | ||
| , "lbiWithSharedLib :: Bool" | ||
| , "lbiWithSharedLib = " ++ show (withSharedLib lbi) | ||
| ] | ||
| where | ||
| verbosity = fromFlagOrDefault minBound (buildVerbosity flags) | ||
| moduledir = libAutogenDir </> "Test" </> "Cabal" | ||
| -- fixme: use component-specific folder | ||
| libAutogenDir = autogenPackageModulesDir lbi | ||
|
|
||
| -- | Convert package database into absolute path, so that | ||
| -- if we change working directories in a subprocess we get the correct database. | ||
| canonicalizePackageDB :: PackageDB -> IO PackageDB | ||
| canonicalizePackageDB (SpecificPackageDB path) | ||
| = SpecificPackageDB `fmap` canonicalizePath path | ||
| canonicalizePackageDB x = return x | ||
|
|
||
| -- | Compute the set of @-package-id@ flags which would be passed when | ||
| -- building the public library. Assumes that the public library is | ||
| -- non-Backpack. | ||
| cabalTestsPackages :: LocalBuildInfo -> [(OpenUnitId, ModuleRenaming)] | ||
| cabalTestsPackages lbi = | ||
| case componentNameCLBIs lbi (CExeName (mkUnqualComponentName "cabal-tests")) of | ||
| [clbi] -> -- [ (unUnitId $ unDefUnitId duid,rn) | (DefiniteUnitId duid, rn) <- componentIncludes clbi ] | ||
| componentIncludes clbi | ||
| _ -> error "cabalTestsPackages" |
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,6 @@ | ||
| module Main (main) where | ||
|
|
||
| import Distribution.Simple | ||
|
|
||
| main :: IO () | ||
| main = defaultMain |
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
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,7 +1,8 @@ | ||
| cabal-version: 2.2 | ||
| name: cabal-testsuite | ||
| version: 3.0.0.0 | ||
| copyright: 2003-2019, Cabal Development Team (see AUTHORS file) | ||
| license: BSD3 | ||
| license: BSD-3-Clause | ||
| license-file: LICENSE | ||
| author: Cabal Development Team <[email protected]> | ||
| maintainer: [email protected] | ||
|
|
@@ -11,7 +12,6 @@ synopsis: Test suite for Cabal and cabal-install | |
| description: | ||
| This package defines a shared test suite for Cabal and cabal-install. | ||
| category: Distribution | ||
| cabal-version: >=1.10 | ||
| build-type: Custom | ||
|
|
||
| extra-source-files: | ||
|
|
@@ -22,7 +22,19 @@ source-repository head | |
| location: https://github.com/haskell/cabal/ | ||
| subdir: cabal-testsuite | ||
|
|
||
| common shared | ||
| default-language: Haskell2010 | ||
|
|
||
| build-depends: | ||
| , base >= 4.8 && <4.13 | ||
| -- this needs to match the in-tree lib:Cabal version | ||
| , Cabal == 3.0.0.0 | ||
|
|
||
| ghc-options: -Wall -fwarn-tabs | ||
|
|
||
| library | ||
| import: shared | ||
|
|
||
| exposed-modules: | ||
| Test.Cabal.Workdir | ||
| Test.Cabal.Script | ||
|
|
@@ -32,54 +44,63 @@ library | |
| Test.Cabal.Server | ||
| Test.Cabal.Monad | ||
| Test.Cabal.CheckArMetadata | ||
|
|
||
| other-modules: | ||
| Test.Cabal.ScriptEnv0 | ||
| autogen-modules: | ||
| Test.Cabal.ScriptEnv0 | ||
|
|
||
| build-depends: | ||
| aeson ==1.4.*, | ||
| attoparsec, | ||
| async, | ||
| base, | ||
| bytestring, | ||
| transformers, | ||
| optparse-applicative >=0.14 && <0.15, | ||
| process, | ||
| directory, | ||
| filepath, | ||
| regex-compat-tdfa, | ||
| regex-tdfa, | ||
| temporary, | ||
| text, | ||
| cryptohash-sha256, | ||
| base16-bytestring, | ||
| Cabal >= 2.3 | ||
| ghc-options: -Wall -fwarn-tabs | ||
| , aeson ^>= 1.4.2.0 | ||
| , async ^>= 2.2.1 | ||
| , attoparsec ^>= 0.13.2.2 | ||
| , base16-bytestring ^>= 0.1.1.6 | ||
| , bytestring ^>= 0.10.6.0 | ||
| , containers ^>= 0.5.6.2 || ^>= 0.6.0.1 | ||
| , cryptohash-sha256 ^>= 0.11.101.0 | ||
| , directory ^>= 1.2.2.0 || ^>= 1.3.0.0 | ||
| , exceptions ^>= 0.10.0 | ||
| , filepath ^>= 1.4.0.0 | ||
| , optparse-applicative ^>= 0.14.3.0 | ||
| , process ^>= 1.2.3.0 || ^>= 1.4.2.0 || ^>= 1.6.1.0 | ||
| , regex-compat-tdfa ^>= 0.95.1.4 | ||
| , regex-tdfa ^>= 1.2.3.1 | ||
| , temporary ^>= 1.3 | ||
| , text ^>= 1.2.3.1 | ||
| , transformers ^>= 0.4.2.0 || ^>= 0.5.2.0 | ||
|
|
||
| if !os(windows) | ||
| build-depends: unix, exceptions | ||
| build-depends: | ||
| , unix ^>= 2.7.1.0 | ||
| else | ||
| build-depends: Win32 | ||
| default-language: Haskell2010 | ||
| build-depends: | ||
| , Win32 | ||
|
|
||
| executable cabal-tests | ||
| import: shared | ||
| main-is: cabal-tests.hs | ||
| hs-source-dirs: main | ||
| ghc-options: -threaded -Wall -fwarn-tabs | ||
| ghc-options: -threaded | ||
| build-depends: | ||
| async, | ||
| base, | ||
| Cabal == 3.0.0.0, | ||
| clock, | ||
| filepath, | ||
| process, | ||
| optparse-applicative, | ||
| cabal-testsuite, | ||
| transformers, | ||
| exceptions | ||
| default-language: Haskell2010 | ||
| , cabal-testsuite | ||
| -- cosntraints inherited via lib:cabal-testsuite component | ||
| , async | ||
| , exceptions | ||
| , filepath | ||
| , optparse-applicative | ||
| , process | ||
| , transformers | ||
| -- dependencies specific to exe:cabal-tests | ||
| , clock ^>= 0.7.2 | ||
|
|
||
| build-tool-depends: cabal-testsuite:setup | ||
|
|
||
| -- this executable is needed by lib:cabal-testsuite | ||
| executable setup | ||
| import: shared | ||
| main-is: Setup.simple.hs | ||
|
|
||
| custom-setup | ||
| -- It's important that we pick the exact same version of lib:Cabal | ||
| -- both here and for cabal-tests itself. Without this constraint, | ||
| -- the solver would pick the in-tree Cabal for cabal-tests's | ||
| -- lib:Cabal dependency, and some stable lib:Cabal version for its | ||
| -- custom-setup's one (due to 'setupMaxCabalVersionConstraint' in | ||
| -- 'D.C.ProjectPlanning'). | ||
| setup-depends: Cabal == 3.0.0.0, | ||
| base | ||
| -- we only depend on even stable releases of lib:Cabal | ||
| setup-depends: Cabal == 2.2.* || == 2.4.* || == 3.0.*, | ||
| base, filepath, directory | ||
Oops, something went wrong.