diff options
| -rw-r--r-- | dev/doc/build-system.dune.md | 17 | ||||
| -rw-r--r-- | dune-project | 4 | ||||
| -rw-r--r-- | dune-workspace | 2 | ||||
| -rw-r--r-- | kernel/.merlin.in | 8 |
4 files changed, 28 insertions, 3 deletions
diff --git a/dev/doc/build-system.dune.md b/dev/doc/build-system.dune.md index 85aaf317ef..36d5e5841b 100644 --- a/dev/doc/build-system.dune.md +++ b/dev/doc/build-system.dune.md @@ -3,6 +3,23 @@ Dune-based build system. If you want to enhance the build system itself (or are curious about its implementation details), see build-system.dev.txt, and in particular its initial HISTORY section. +Quick Start +=========== + +You need Dune >= 1.2.1 ; just type `dune build` to build the base Coq +libraries. No `./configure` step is needed. + +Dune will get confused if it finds leftovers of in-tree compilation, +so please be sure your tree is clean from objects files generated by +the make-based system. + +If you want to build the standard libraries and plugins you should +call `make -f Makefile.dune voboot`. It is usually enough to do that +once per-session. + +More helper targets are availabe in `Makefile.dune`, `make -f +Makefile.dune` will display help. + Dune ==== diff --git a/dune-project b/dune-project index 6ce4ec4717..607e5a68a5 100644 --- a/dune-project +++ b/dune-project @@ -1,3 +1,3 @@ -(lang dune 1.1) +(lang dune 1.2) -(name coq-devel) +(name coq) diff --git a/dune-workspace b/dune-workspace index 682631e7dc..aae70e598b 100644 --- a/dune-workspace +++ b/dune-workspace @@ -1,4 +1,4 @@ -(lang dune 1.1) +(lang dune 1.2) ; Add custom flags here. Default developer profile is `dev` (env diff --git a/kernel/.merlin.in b/kernel/.merlin.in new file mode 100644 index 0000000000..912ff61496 --- /dev/null +++ b/kernel/.merlin.in @@ -0,0 +1,8 @@ +FLG -rectypes -thread -safe-string -w +a-4-44-50 + +S ../clib +B ../clib +S ../config +B ../config +S ../lib +B ../lib |