diff --git a/README.md b/README.md index 4905b1be9332925d51f66f124ba9e05c6291d406..046ed3ff782058405c856a82e3f263d44c2ccfcc 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,14 @@ sudo apt install npm sudo npm install --global esy@latest ``` -Then to download and compile the dependencies, and compile the sources: +Then to download and compile all dependencies (including Coq), and compile the sources: ``` esy ``` Note that `esy` uses a specific compiling environment, which is not exported to the current shell. -To work within this environment, either prefix any command with `esy` (e.g. `esy emacs` to run Emacs with Proof General), or type `esy shell` to open a shell with the right environment. +To work within this environment, prefix any command with `esy`, e.g. `esy coqide` to run your system’s coqIDE within the right environment. +Alternatively, `esy shell` opens a shell with this environment. ### From sources diff --git a/package.json b/package.json index 7cbec8fc4bc3e7429c3ccdacdff3beb80ededb0d..773efb5af7d6ed7e5eb0cc2c21dc049433d4817e 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ ["./create_makefile.sh"], ["make", "-j"] ], - "install": ["make install"] + "install": "make install" }, "scripts": { "clean": "make clean", diff --git a/scripts/Makefile.patch b/scripts/Makefile.patch index 907207cce07d262313d7881e75e76006c1844418..110128527a250e933bef9240af89da99d6e10307 100644 --- a/scripts/Makefile.patch +++ b/scripts/Makefile.patch @@ -1,6 +1,18 @@ ---- Makefile.orig 2019-10-15 22:37:51.000000000 +0200 -+++ Makefile 2019-10-15 22:33:50.000000000 +0200 -@@ -179,7 +179,7 @@ +--- Makefile.orig 2021-10-04 11:15:22.592822933 +0200 ++++ Makefile 2021-10-04 11:17:18.684584261 +0200 +@@ -15,6 +15,11 @@ + SELF := $(lastword $(MAKEFILE_LIST)) + PARENT := $(firstword $(MAKEFILE_LIST)) + ++# In the esy container, $HOME is hidden, but this causes Coq to complain. ++# We thus include a dummy $HOME value. ++HOME ?= $(DESTDIR) ++export HOME ++ + # This file is generated by coq_makefile and contains many variable + # definitions, like the list of .v files or the path to Coq + include Makefile.conf +@@ -211,7 +216,7 @@ # these flags do NOT contain the libraries, to make them easier to overwrite COQFLAGS?=-q $(OTHERFLAGS) $(COQEXTRAFLAGS) COQCHKFLAGS?=-silent -o $(COQCHKEXTRAFLAGS) @@ -9,7 +21,7 @@ COQDOCLIBS?=$(COQLIBS_NOML) -@@ -422,6 +422,9 @@ +@@ -480,6 +485,9 @@ $(HIDE)mkdir -p html $(HIDE)$(COQDOC) \ -toc $(COQDOCFLAGS) -html $(GAL) $(COQDOCLIBS) -d html $(VFILES) @@ -19,7 +31,7 @@ mlihtml: $(MLIFILES:.mli=.cmi) $(SHOW)'CAMLDOC -d $@' -@@ -446,6 +449,10 @@ +@@ -504,6 +512,10 @@ -toc $(COQDOCFLAGS) -pdf $(GAL) $(COQDOCLIBS) \ -o $@ `$(COQDEP) -sort -suffix .v $(VFILES)` @@ -30,7 +42,7 @@ # FIXME: not quite right, since the output name is different gallinahtml: GAL=-g gallinahtml: html -@@ -585,6 +591,17 @@ +@@ -646,6 +658,17 @@ $(HIDE)rm -f $(CMOFILES:%.cmo=%.cmx) .PHONY: archclean @@ -45,6 +57,6 @@ + +spell:: + ./scripts/flag-typos-in-comments.sh `find . -iname '*.v' ! -path './classic/*'` - + # Compilation rules ###########################################################