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 /lib/Distribution/Helper/Discover.hs | |
| 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 'lib/Distribution/Helper/Discover.hs')
| -rw-r--r-- | lib/Distribution/Helper/Discover.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Distribution/Helper/Discover.hs b/lib/Distribution/Helper/Discover.hs index 635474d..b074261 100644 --- a/lib/Distribution/Helper/Discover.hs +++ b/lib/Distribution/Helper/Discover.hs @@ -56,11 +56,11 @@ findProjects dir = execWriterT $ do liftIO (findCabalFiles dir) findDistDirs (ProjLocV1CabalFile cabal _) = - [DistDirV1 $ replaceFileName cabal "dist/"] -findDistDirs (ProjLocV1Dir dir) = [DistDirV1 $ dir </> "dist/"] + [DistDirCabal SCV1 $ replaceFileName cabal "dist/"] +findDistDirs (ProjLocV1Dir dir) = [DistDirCabal SCV1 $ dir </> "dist/"] findDistDirs (ProjLocV2File cabal) = - [DistDirV2 $ replaceFileName cabal "dist-newstyle/"] -findDistDirs (ProjLocV2Dir dir) = [DistDirV2 $ dir </> "dist-newstyle/"] + [DistDirCabal SCV2 $ replaceFileName cabal "dist-newstyle/"] +findDistDirs (ProjLocV2Dir dir) = [DistDirCabal SCV2 $ dir </> "dist-newstyle/"] findDistDirs (ProjLocStackYaml _) = [DistDirStack Nothing] findDistDirsWithHints = undefined |