Skip to content

Commit 2191318

Browse files
cleanup README / INSTALL instructions (#1619)
1 parent e8a8924 commit 2191318

File tree

2 files changed

+15
-17
lines changed

2 files changed

+15
-17
lines changed

INSTALL.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
## Requirements
44

5-
- [The Coq Proof Assistant version ≥ 8.20](https://coq.inria.fr)
5+
- [The Coq Proof Assistant version ≥ 8.20 / Rocq Prover version ≥ 9.0](https://rocq-prover.org)
66
- [Mathematical Components version ≥ 2.2.0](https://github.com/math-comp/math-comp)
77
- [Finmap library version ≥ 2.1.0](https://github.com/math-comp/finmap)
8-
- [Hierarchy builder version >= 1.7.0](https://github.com/math-comp/hierarchy-builder)
9-
- [bigenough >= 1.0.0](https://github.com/math-comp/bigenough)
8+
- [Hierarchy builder version 1.7.0](https://github.com/math-comp/hierarchy-builder)
9+
- [bigenough 1.0.0](https://github.com/math-comp/bigenough)
1010

1111
These requirements can be installed in a custom way, or through
1212
[opam](https://opam.ocaml.org/) (the recommended way) using
13-
the repository https://coq.inria.fr/opam/released, which you can add by typing
14-
`opam repo add coq-released https://coq.inria.fr/opam/released`.
13+
the repository https://rocq-prover.org/opam/released, which you can add by typing
14+
`opam repo add rocq-released https://rocq-prover.org/opam/released`.
1515

1616
Detailed instructions for possible installations of Mathematical Components are located
1717
[here](https://github.com/math-comp/math-comp/blob/master/INSTALL.md).
@@ -22,8 +22,10 @@ Detailed instructions for possible installations of Mathematical Components are
2222
+ type `opam install coq-mathcomp-analysis.X.Y.Z` where `X.Y.Z` is the version number
2323
(all the dependencies should be automatically installed, assuming `opam` has been properly
2424
configured and `coq-released` repository is added)
25-
- Custom (assuming the requirements are met):
26-
+ type `make` to use the provided `Makefile`
25+
- Custom:
26+
+ first, install the required dependencies, for example with opam
27+
type `opam install --deps-only coq-mathcomp-analysis.X.Y.Z`
28+
+ assuming the requirements are met, type `make` to use the provided `Makefile`
2729

2830
## From scratch instructions
2931

@@ -40,7 +42,7 @@ $ sh <(curl -sL https://raw.githubusercontent.com/ocaml/opam/master/shell/instal
4042
$ export OPAMROOT=~/.opam_mathcomp_analysis # opam configuration, metadata, logs, temporary directories and caches
4143
$ opam init -j4 # adapt to the number of cores you have
4244
$ eval `opam config env`
43-
$ opam repo add coq-released https://coq.inria.fr/opam/released
45+
$ opam repo add rocq-released https://rocq-prover.org/opam/released
4446
```
4547
3. Install our package (and all its dependencies)
4648
```
@@ -71,7 +73,7 @@ using [proof general for emacs](https://github.com/ProofGeneral/PG)
7173

7274
## Break-down of phase 3 of the installation procedure step by step
7375

74-
With the example of Coq 8.20.0 and MathComp 2.3.0. For other versions, update the
76+
With the example of Coq 8.20.1 and MathComp 2.3.0. For other versions, update the
7577
version numbers accordingly.
7678

7779
1. Install Coq 8.20.1

README.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
<!---
2-
This file was generated from `meta.yml`, please do not edit manually.
3-
Follow the instructions on https://github.com/coq-community/templates to regenerate.
4-
--->
51
# Analysis library compatible with Mathematical Components
62

73
[![Nix CI][nix-action-shield]][nix-action-link]
@@ -11,9 +7,9 @@ Follow the instructions on https://github.com/coq-community/templates to regener
117
[nix-action-link]: https://github.com/math-comp/analysis/actions?query=branch%3Amaster+event%3Apush
128

139
[chat-shield]: https://img.shields.io/badge/zulip-join_chat-brightgreen.svg
14-
[chat-link]: https://coq.zulipchat.com/login/#narrow/stream/237666-math-comp-analysis
10+
[chat-link]: https://rocq-prover.zulipchat.com/#narrow/channel/237666-math-comp-analysis
1511

16-
This repository contains a real analysis library for the Coq proof-assistant.
12+
This repository contains a real analysis library for the Coq / Rocq proof-assistant.
1713
It is based on the [Mathematical Components](https://math-comp.github.io/) library.
1814

1915
In terms of [opam](https://opam.ocaml.org/doc/Install.html), it comes as the following packages:
@@ -46,7 +42,7 @@ The easiest way to install the latest released version of MathComp-Analysis libr
4642
via the [opam](https://opam.ocaml.org/doc/Install.html) package manager:
4743

4844
```shell
49-
opam repo add coq-released https://coq.inria.fr/opam/released
45+
opam repo add rocq-released https://rocq-prover.org/opam/released
5046
opam install coq-mathcomp-analysis
5147
```
5248
Note that the packages `coq-mathcomp-classical` and `coq-mathcomp-reals` will be installed as dependencies.
@@ -58,7 +54,7 @@ To build and install manually, make sure that the dependencies are met and do:
5854
``` shell
5955
git clone https://github.com/math-comp/analysis.git
6056
cd analysis
61-
make # or make -j <number-of-cores-on-your-machine>
57+
make # or make -j <number-of-cores-on-your-machine>
6258
make install
6359
```
6460

0 commit comments

Comments
 (0)