diff options
| author | Daniel Gröber <dxld@darkboxed.org> | 2019-07-30 16:08:18 +0200 |
|---|---|---|
| committer | Daniel Gröber (dxld) <dxld@darkboxed.org> | 2019-09-17 17:48:26 +0200 |
| commit | f29e10402d7cba68264f06d8644712e189e17142 (patch) | |
| tree | 667c494131cf5fa1dd04fa664cb8a2b6d6d767ee /tests | |
| parent | 8c9361e4ba6e2257f2bd9d354a56005318477ed6 (diff) | |
Split SProjType along build-tool line
This makes it much easier to deal with differences between the build tools
as we can now have functions that only make sense for Cabal and statically
enforce this by passing a 'SCabalProjType pt' as evidence that $pt \in {V1,
V2}$.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Examples.hs | 2 | ||||
| -rw-r--r-- | tests/GhcSession.hs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/Examples.hs b/tests/Examples.hs index 607b83d..e1fda9e 100644 --- a/tests/Examples.hs +++ b/tests/Examples.hs @@ -49,7 +49,7 @@ parseOpts argv = doCabalV2 :: IO () doCabalV2 = do _ <- systemV "cabal new-build --builddir=dist-newstyle" - qe <- mkQueryEnv (ProjLocV2Dir ".") (DistDirV2 "dist-newstyle/") + qe <- mkQueryEnv (ProjLocV2Dir ".") (DistDirCabal SCV2 "dist-newstyle/") printUnitInfos qe doCabalV1 :: IO () diff --git a/tests/GhcSession.hs b/tests/GhcSession.hs index 871fddd..22b94b4 100644 --- a/tests/GhcSession.hs +++ b/tests/GhcSession.hs @@ -419,8 +419,8 @@ data ProjSetupImpl pt = oldBuildProjSetup :: ProjSetup0 oldBuildProjSetup = ProjSetupDescr "cabal-v1" $ Right $ Ex $ ProjSetupImpl - { psiProjType = SV1 - , psiDistDir = \dir -> DistDirV1 (dir </> "dist") + { psiProjType = SCabal SCV1 + , psiDistDir = \dir -> DistDirCabal SCV1 (dir </> "dist") , psiProjLoc = \(CabalFile cf) projdir -> ProjLocV1CabalFile cf projdir , psiConfigure = \progs dir -> runWithCwd dir (cabalProgram progs) [ "configure" ] @@ -433,8 +433,8 @@ oldBuildProjSetup = ProjSetupDescr "cabal-v1" $ Right $ Ex $ ProjSetupImpl newBuildProjSetup :: ProjSetup0 newBuildProjSetup = ProjSetupDescr "cabal-v2" $ Right $ Ex $ ProjSetupImpl - { psiProjType = SV2 - , psiDistDir = \dir -> DistDirV2 (dir </> "dist-newstyle") + { psiProjType = SCabal SCV2 + , psiDistDir = \dir -> DistDirCabal SCV2 (dir </> "dist-newstyle") , psiProjLoc = \_cabal_file projdir -> ProjLocV2File $ projdir </> "cabal.project" -- TODO: check if cabal.project is there and only use -- V2File then, also remove addCabalProject below so we |