Skip to content

Commit 72be26b

Browse files
committed
Remove projects; weeder, doctest & libonly
* 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
1 parent ed5d404 commit 72be26b

File tree

5 files changed

+7
-41
lines changed

5 files changed

+7
-41
lines changed

Makefile

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33

44
CABALBUILD := cabal build
55
CABALRUN := cabal run
6-
DOCTEST := cabal repl --with-ghc=doctest --repl-options="-w" --project-file=cabal.project.doctest
6+
7+
# The newer and prefered way to call the doctest tool is:
8+
# $ cabal repl --with-ghc=doctest
9+
# SEE: https://github.com/haskell/cabal/issues/8504
10+
# There is but one caveat, we have to avoid allow-newer.
11+
# SEE: https://github.com/haskell/cabal/issues/6859
12+
DOCTEST := cabal repl --with-ghc=doctest --repl-options="-w" --ghc-options="-Wwarn" --allow-newer=False
713

814
# default rules
915

@@ -81,11 +87,6 @@ ghcid-lib :
8187
ghcid-cli :
8288
ghcid -c 'cabal repl cabal-install'
8389

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

184-
# Weeder
185-
weeder :
186-
cabal build all --project-file=cabal.project.weeder
187-
weeder | less
188-
189185
# tags
190186
.PHONY : tags
191187
tags :

cabal.project.doctest

Lines changed: 0 additions & 3 deletions
This file was deleted.

cabal.project.libonly

Lines changed: 0 additions & 5 deletions
This file was deleted.

cabal.project.weeder

Lines changed: 0 additions & 13 deletions
This file was deleted.

weeder.dhall

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)