Skip to content

Commit

Permalink
Remove projects; weeder, doctest & libonly
Browse files Browse the repository at this point in the history
* Remove cabal.project.libonly

It was only referenced once in a stale Makefile comment about doctests.

* Remove weeder

- remove weeder's configuration
- remove its recipe from Makefile
- remove its project

* Delete cabal.project.doctest

- Adding --ghc-options="-Wwarn" is sufficient to avoid the numerous <interactive> failures seen otherwise
- write-ghc-environment-files has a default of never
  • Loading branch information
philderbeast committed Mar 26, 2024
1 parent ed5d404 commit 72be26b
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 41 deletions.
18 changes: 7 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@

CABALBUILD := cabal build
CABALRUN := cabal run
DOCTEST := cabal repl --with-ghc=doctest --repl-options="-w" --project-file=cabal.project.doctest

# The newer and prefered way to call the doctest tool is:
# $ cabal repl --with-ghc=doctest
# SEE: https://github.com/haskell/cabal/issues/8504
# There is but one caveat, we have to avoid allow-newer.
# SEE: https://github.com/haskell/cabal/issues/6859
DOCTEST := cabal repl --with-ghc=doctest --repl-options="-w" --ghc-options="-Wwarn" --allow-newer=False

# default rules

Expand Down Expand Up @@ -81,11 +87,6 @@ ghcid-lib :
ghcid-cli :
ghcid -c 'cabal repl cabal-install'

# Artem, 2023-02-03, https://github.com/haskell/cabal/issues/8504
# The new and prefered way to call the doctest tool (as of now) is based on cabal repl --with-ghc=doctest.
# The call below reflects the current documentation of the doctest tool except one caveat,
# which is https://github.com/haskell/cabal/issues/6859, i.e. we have to hide allow-newer in our project
# file from cabal/doctest. This is easy: we just select a project file with no allow-newer (e.g. cabal.project.libonly).
doctest :
$(DOCTEST) Cabal-syntax
$(DOCTEST) Cabal-described
Expand Down Expand Up @@ -181,11 +182,6 @@ validate-via-docker-8.10.4:
validate-via-docker-old:
docker build $(DOCKERARGS) -t cabal-validate:older -f .docker/validate-old.dockerfile .

# Weeder
weeder :
cabal build all --project-file=cabal.project.weeder
weeder | less

# tags
.PHONY : tags
tags :
Expand Down
3 changes: 0 additions & 3 deletions cabal.project.doctest

This file was deleted.

5 changes: 0 additions & 5 deletions cabal.project.libonly

This file was deleted.

13 changes: 0 additions & 13 deletions cabal.project.weeder

This file was deleted.

9 changes: 0 additions & 9 deletions weeder.dhall

This file was deleted.

0 comments on commit 72be26b

Please sign in to comment.