Skip to content

Commit

Permalink
"make world" and dune default target don't build coqide
Browse files Browse the repository at this point in the history
makefile: add coqide target

The current behaviour seems mostly annoying to those who don't care
about coqide.
  • Loading branch information
SkySkimmer committed Jul 24, 2024
1 parent c87f90a commit 6752d5b
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ before_script:
- make $DUNE_TARGET
- tar cfj _build.tar.bz2 _build
variables:
DUNE_TARGET: world
DUNE_TARGET: "world coqide"
artifacts:
name: "$CI_JOB_NAME"
when: always
Expand Down
16 changes: 10 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

# Dune Makefile for Coq

.PHONY: help help-install states world watch check # Main developer targets
.PHONY: help help-install states world coqide watch check # Main developer targets
.PHONY: refman-html refman-pdf stdlib-html apidoc # Documentation targets
.PHONY: test-suite dev-targets
.PHONY: fmt ocheck obuild ireport clean # Maintenance targets
Expand Down Expand Up @@ -39,8 +39,9 @@ help:
@echo "make help-install for installation instructions. Common developer targets are:"
@echo ""
@echo " - states: build a minimal functional coqtop"
@echo " - world: build all public binaries and libraries in developer mode"
@echo " - watch: build all public binaries and libraries [continuous build]"
@echo " - world: build main public binaries and libraries in developer mode (no coqide)"
@echo " - watch: build main public binaries and libraries [continuous build]"
@echo " - coqide: build coqide binary in developer mode"
@echo " - check: build all ML files as fast as possible"
@echo " - test-suite: run Coq's test suite [env NJOBS=N to set job parallelism]"
@echo " - dunestrap: Generate the dune rules for vo files"
Expand Down Expand Up @@ -145,13 +146,16 @@ dunestrap: $(DUNE_FILES)
states: dunestrap
dune build $(DUNEOPT) dev/shim/coqtop

NONDOC_INSTALL_TARGETS:=coq-core.install coq-stdlib.install coqide-server.install coqide.install coq.install
MAIN_TARGETS:=coq-core.install coq-stdlib.install coqide-server.install coq.install

world: dunestrap
dune build $(DUNEOPT) $(NONDOC_INSTALL_TARGETS)
dune build $(DUNEOPT) $(MAIN_TARGETS)

coqide:
dune build $(DUNEOPT) coqide.install

watch:
dune build $(DUNEOPT) $(NONDOC_INSTALL_TARGETS) -w
dune build $(DUNEOPT) $(MAIN_TARGETS) -w

check:
dune build $(DUNEOPT) @check
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- **Changed:**
when building Coq, the makefile's `world` target and `dune build`'s default target do not build coqide anymore.
Use `make world coqide` or `dune build @default coqide.install` to build what they respectively used to build
(`#19378 <https://github.com/coq/coq/pull/19378>`_,
by Gaëtan Gilbert).
2 changes: 1 addition & 1 deletion dune
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

(alias
(name default)
(deps coq-core.install coq-stdlib.install coqide-server.install coqide.install))
(deps coq-core.install coq-stdlib.install coqide-server.install))

(install
(section lib)
Expand Down

0 comments on commit 6752d5b

Please sign in to comment.