Merge the two Globbing modules in cabal and cabal-install
We use the datatype representation from the globbing in cabal-install, but preserve a standalone parser for globs present in cabal files, whose specification is constrained by the cabal specification. The implementations are merged taking the best parts of each. We also make sure sdist is robust to accidentally-listed directories, as the refactor of the globbing modules re-uncovered this issue, and required a prompt fix for the refactor not to break some things. Fixes #5349
Showing
- Cabal-tests/tests/UnitTests/Distribution/Simple/Glob.hs 9 additions, 5 deletionsCabal-tests/tests/UnitTests/Distribution/Simple/Glob.hs
- Cabal/Cabal.cabal 1 addition, 0 deletionsCabal/Cabal.cabal
- Cabal/src/Distribution/PackageDescription/Check.hs 18 additions, 7 deletionsCabal/src/Distribution/PackageDescription/Check.hs
- Cabal/src/Distribution/PackageDescription/Check/Paths.hs 5 additions, 0 deletionsCabal/src/Distribution/PackageDescription/Check/Paths.hs
- Cabal/src/Distribution/Simple/Glob.hs 49 additions, 277 deletionsCabal/src/Distribution/Simple/Glob.hs
- Cabal/src/Distribution/Simple/Glob/Internal.hs 497 additions, 0 deletionsCabal/src/Distribution/Simple/Glob/Internal.hs
- Cabal/src/Distribution/Simple/Haddock.hs 1 addition, 1 deletionCabal/src/Distribution/Simple/Haddock.hs
- Cabal/src/Distribution/Simple/SrcDist.hs 7 additions, 6 deletionsCabal/src/Distribution/Simple/SrcDist.hs
- cabal-install/src/Distribution/Client/FileMonitor.hs 15 additions, 14 deletionscabal-install/src/Distribution/Client/FileMonitor.hs
- cabal-install/src/Distribution/Client/Glob.hs 42 additions, 163 deletionscabal-install/src/Distribution/Client/Glob.hs
- cabal-install/src/Distribution/Client/ProjectConfig.hs 5 additions, 5 deletionscabal-install/src/Distribution/Client/ProjectConfig.hs
- cabal-install/src/Distribution/Client/RebuildMonad.hs 3 additions, 3 deletionscabal-install/src/Distribution/Client/RebuildMonad.hs
- cabal-install/tests/UnitTests/Distribution/Client/ArbitraryInstances.hs 12 additions, 9 deletions...tests/UnitTests/Distribution/Client/ArbitraryInstances.hs
- cabal-install/tests/UnitTests/Distribution/Client/DescribedInstances.hs 2 additions, 2 deletions...tests/UnitTests/Distribution/Client/DescribedInstances.hs
- cabal-install/tests/UnitTests/Distribution/Client/FileMonitor.hs 8 additions, 8 deletions...nstall/tests/UnitTests/Distribution/Client/FileMonitor.hs
- cabal-install/tests/UnitTests/Distribution/Client/Glob.hs 24 additions, 24 deletionscabal-install/tests/UnitTests/Distribution/Client/Glob.hs
- cabal-testsuite/PackageTests/Check/ConfiguredPackage/Paths/AbsolutePath/cabal.out 1 addition, 1 deletion...ests/Check/ConfiguredPackage/Paths/AbsolutePath/cabal.out
- cabal-testsuite/PackageTests/SDist/T5195/cabal.out 0 additions, 3 deletionscabal-testsuite/PackageTests/SDist/T5195/cabal.out
- cabal-testsuite/PackageTests/SDist/T5195and5349/Main.hs 0 additions, 0 deletionscabal-testsuite/PackageTests/SDist/T5195and5349/Main.hs
- cabal-testsuite/PackageTests/SDist/T5195and5349/actually-a-directory/some-file 0 additions, 0 deletions...geTests/SDist/T5195and5349/actually-a-directory/some-file
Loading
Please register or sign in to comment