Skip to content

Commit 5dd5dca

Browse files
authored
Add doc/ to the target in Makefile and make the cabal command customizable (agda#2830)
* Add stack yaml for GHC 9.10.2 (stackage lts-24.11) * Fix Everything.agda targets in Makefile * Allow customization of the cabal command * Bump CI tag to Agda v2.8.0 (not RCs) * Fix CABAL_EXEC variable name * Update stack-9.10.2 to 9.10.3
1 parent dd64a3a commit 5dd5dca

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

GNUmakefile

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,36 @@ AGDA_EXEC ?= agda
22
AGDA_OPTIONS=-Werror
33
AGDA_RTS_OPTIONS=+RTS -M4.0G -H3.5G -A128M -RTS
44
AGDA=$(AGDA_EXEC) $(AGDA_OPTIONS) $(AGDA_RTS_OPTIONS)
5+
CABAL_EXEC ?= cabal
6+
CABAL_RUN_COMMAND=$(CABAL_EXEC) run
57

68
# Before running `make test` the `fix-whitespace` program should
79
# be installed:
810
#
911
# cabal install fix-whitespace
1012

11-
test: Everything.agda check-whitespace
13+
test: doc/Everything.agda check-whitespace
1214
cd doc && $(AGDA) README.agda
1315

1416
testsuite:
1517
$(MAKE) -C tests test AGDA="$(AGDA)" AGDA_EXEC="$(AGDA_EXEC)" only=$(only)
1618

1719
fix-whitespace:
18-
cabal exec -- fix-whitespace
20+
$(CABAL_EXEC) exec -- fix-whitespace
1921

2022
check-whitespace:
21-
cabal exec -- fix-whitespace --check
23+
$(CABAL_EXEC) exec -- fix-whitespace --check
2224

23-
setup: Everything.agda
25+
setup: doc/Everything.agda
2426

25-
.PHONY: Everything.agda
26-
Everything.agda:
27-
cabal run GenerateEverything -- --out-dir doc
27+
.PHONY: doc/Everything.agda
28+
doc/Everything.agda:
29+
$(CABAL_RUN_COMMAND) GenerateEverything -- --out-dir doc
2830

2931
.PHONY: listings
30-
listings: Everything.agda
32+
listings: doc/Everything.agda
3133
cd doc && $(AGDA) --html README.agda -v0
3234

3335
clean :
3436
find . -type f -name '*.agdai' -delete
35-
rm -f Everything.agda EverythingSafe.agda
37+
rm -f doc/Everything.agda doc/EverythingSafe.agda

stack-9.10.3.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
snapshot: lts-24.17
2+
compiler: ghc-9.10.3
3+
compiler-check: match-exact
4+
packages:
5+
- .

0 commit comments

Comments
 (0)