aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmilio Jesus Gallego Arias2020-01-22 17:21:25 +0100
committerEmilio Jesus Gallego Arias2020-01-22 17:21:25 +0100
commitc3129a127dd682e074b64ca7f31cbc8f44548392 (patch)
treeae457cfc16b33b7514c15a5ba7a9b48fb6156718
parentdc25c63771fb32a4236b04eb940e7881f28669e1 (diff)
[lint] Use makefile wrapper instead of calling dune command directly.
This is necessary until we get of the voboot step. See https://github.com/coq/coq/pull/11406#issuecomment-577261843 for more details.
-rw-r--r--Makefile.dune6
-rwxr-xr-xdev/lint-repository.sh2
2 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.dune b/Makefile.dune
index bafb40d55f..b433ed1b94 100644
--- a/Makefile.dune
+++ b/Makefile.dune
@@ -6,7 +6,7 @@
.PHONY: quickbyte quickopt quickide # Partial / quick developer targets
.PHONY: refman-html stdlib-html apidoc # Documentation targets
.PHONY: test-suite release # Accessory targets
-.PHONY: ocheck ireport clean # Maintenance targets
+.PHONY: fmt ocheck ireport clean # Maintenance targets
# use DUNEOPT=--display=short for a more verbose build
# DUNEOPT=--display=short
@@ -36,6 +36,7 @@ help:
@echo " - apidoc: build ML API documentation"
@echo " - release: build Coq in release mode"
@echo ""
+ @echo " - fmt: run ocamlformat on the codebase"
@echo " - ocheck: build for all supported OCaml versions [requires OPAM]"
@echo " - ireport: build with optimized flambda settings and emit an inline report"
@echo " - clean: remove build directory and autogenerated files"
@@ -100,6 +101,9 @@ apidoc: voboot
release: voboot
dune build $(DUNEOPT) -p coq
+fmt: voboot
+ dune build @fmt
+
ocheck: voboot
dune build $(DUNEOPT) @install --workspace=dev/dune-workspace.all
diff --git a/dev/lint-repository.sh b/dev/lint-repository.sh
index 224601bbce..553696410c 100755
--- a/dev/lint-repository.sh
+++ b/dev/lint-repository.sh
@@ -33,6 +33,6 @@ echo Checking overlays
dev/tools/check-overlays.sh || CODE=1
echo Checking ocamlformat
-dune build @fmt || CODE=1
+make -f Makefile.dune fmt || CODE=1
exit $CODE