Skip to content

Commit 7c4352c

Browse files
MSoegtropIMCMSoegtropIMC
authored
Merge pull request #448 from MSoegtropIMC/release-2024.10.1
Prepare bug-fix release to adjust to opam 2.3.0
2 parents 1a7db05 + 8b4adbd commit 7c4352c

36 files changed

+229
-195
lines changed

‎README.md

+38-33
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@ The Coq Platform team does no double check this information.
7878

7979
<details><summary><font size="+1">Release notes / changelog</font></summary>
8080

81+
## Changes in 2024.10.1
82+
83+
This is a "source only" bugfix release which addresses changes in the opam file format in opam 2.3.0.
84+
The installers and package pick lists are unmodified from the previous release.
85+
8186
## Changes in 2024.10.0
8287

8388
- added new pick 8.19~2024.10
@@ -277,31 +282,31 @@ You can list the available switches with:
277282
```
278283
~$ opam switch
279284
# switch compiler description
280-
CP.2024.10.0~8.12 ocaml-base-compiler.4.10.2 Coq 8.12.2 (released Dec 2020) with the first package pick from Dec 2020
281-
CP.2024.10.0~8.13~2021.02 ocaml-base-compiler.4.10.2 Coq 8.13.2 (released Apr 2021) with the first package pick from Feb 2021
282-
CP.2024.10.0~8.13~2021.09 ocaml-base-compiler.4.10.2 Coq 8.13.2 (released Apr 2021) with an extended package pick from Sep 2021
283-
CP.2024.10.0~8.13~2022.01 ocaml-base-compiler.4.10.2 Coq 8.13.2 (released Apr 2021) with an updated package pick from Jan 2022
284-
CP.2024.10.0~8.14~2022.01 ocaml-option-flambda.1,ocaml-variants.4.12.1+options Coq 8.14.1 (released Nov 2021) with the first package pick from Jan 2022
285-
CP.2024.10.0~8.14~2022.04 ocaml-option-flambda.1,ocaml-variants.4.12.1+options Coq 8.14.1 (released Nov 2021) with an updated package pick from Apr 2022
286-
CP.2024.10.0~8.15~2022.04 ocaml-option-flambda.1,ocaml-variants.4.13.1+options Coq 8.15.2 (released Jun 2022) with the first package pick from Apr 2022
287-
CP.2024.10.0~8.15~2022.09 ocaml-option-flambda.1,ocaml-variants.4.13.1+options Coq 8.15.2 (released Jun 2022) with an updated package pick from Sep 2022
288-
CP.2024.10.0~8.16~2022.09 ocaml-option-flambda.1,ocaml-variants.4.13.1+options Coq 8.16.1 (released Nov 2022) with the first package pick from Sep 2022
289-
CP.2024.10.0~8.16~2023.08 ocaml-option-flambda.1,ocaml-variants.4.14.1+options Coq 8.16.1 (released Nov 2022) with an updated package pick from from Aug 2023
290-
CP.2024.10.0~8.17~2023.08 ocaml-option-flambda.1,ocaml-variants.4.14.1+options Coq 8.17.1 (released Jun 2023) with the first package pick from Aug 2023
291-
CP.2024.10.0~8.18~2023.11 ocaml-option-flambda.1,ocaml-variants.4.14.1+options Coq 8.18.0 (released Sep 2023) with the first package pick from Nov 2023
292-
CP.2024.10.0~8.18~mc2 ocaml-option-flambda.1,ocaml-variants.4.14.1+options Coq 8.18.0 (released Sep 2023) with a package pick based on mathcomp 2.1
293-
→ CP.2024.10.0~8.19~2024.10 ocaml-option-flambda.1,ocaml-variants.4.14.2+options Coq 8.19.2 (released Jun 2024) with the first package pick from Oct 2024
294-
CP.2024.10.0~dev ocaml-option-flambda.1,ocaml-variants.4.13.1+options Coq dev (latest master of all packages)
285+
CP.2024.10.1~8.12 ocaml-base-compiler.4.10.2 Coq 8.12.2 (released Dec 2020) with the first package pick from Dec 2020
286+
CP.2024.10.1~8.13~2021.02 ocaml-base-compiler.4.10.2 Coq 8.13.2 (released Apr 2021) with the first package pick from Feb 2021
287+
CP.2024.10.1~8.13~2021.09 ocaml-base-compiler.4.10.2 Coq 8.13.2 (released Apr 2021) with an extended package pick from Sep 2021
288+
CP.2024.10.1~8.13~2022.01 ocaml-base-compiler.4.10.2 Coq 8.13.2 (released Apr 2021) with an updated package pick from Jan 2022
289+
CP.2024.10.1~8.14~2022.01 ocaml-option-flambda.1,ocaml-variants.4.12.1+options Coq 8.14.1 (released Nov 2021) with the first package pick from Jan 2022
290+
CP.2024.10.1~8.14~2022.04 ocaml-option-flambda.1,ocaml-variants.4.12.1+options Coq 8.14.1 (released Nov 2021) with an updated package pick from Apr 2022
291+
CP.2024.10.1~8.15~2022.04 ocaml-option-flambda.1,ocaml-variants.4.13.1+options Coq 8.15.2 (released Jun 2022) with the first package pick from Apr 2022
292+
CP.2024.10.1~8.15~2022.09 ocaml-option-flambda.1,ocaml-variants.4.13.1+options Coq 8.15.2 (released Jun 2022) with an updated package pick from Sep 2022
293+
CP.2024.10.1~8.16~2022.09 ocaml-option-flambda.1,ocaml-variants.4.13.1+options Coq 8.16.1 (released Nov 2022) with the first package pick from Sep 2022
294+
CP.2024.10.1~8.16~2023.08 ocaml-option-flambda.1,ocaml-variants.4.14.1+options Coq 8.16.1 (released Nov 2022) with an updated package pick from from Aug 2023
295+
CP.2024.10.1~8.17~2023.08 ocaml-option-flambda.1,ocaml-variants.4.14.1+options Coq 8.17.1 (released Jun 2023) with the first package pick from Aug 2023
296+
CP.2024.10.1~8.18~2023.11 ocaml-option-flambda.1,ocaml-variants.4.14.1+options Coq 8.18.0 (released Sep 2023) with the first package pick from Nov 2023
297+
CP.2024.10.1~8.18~mc2 ocaml-option-flambda.1,ocaml-variants.4.14.1+options Coq 8.18.0 (released Sep 2023) with a package pick based on mathcomp 2.1
298+
→ CP.2024.10.1~8.19~2024.10 ocaml-option-flambda.1,ocaml-variants.4.14.2+options Coq 8.19.2 (released Jun 2024) with the first package pick from Oct 2024
299+
CP.2024.10.1~dev ocaml-option-flambda.1,ocaml-variants.4.13.1+options Coq dev (latest master of all packages)
295300
```
296301

297302
You can select the opam switch for **all shells** with e.g.:
298303
```
299-
~$ opam switch CP.2024.10.0~8.19~2024.10
304+
~$ opam switch CP.2024.10.1~8.19~2024.10
300305
```
301306

302307
You can select the opam switch for **just the current shell** with e.g.:
303308
```
304-
eval $(opam config env --set-switch --switch CP.2024.10.0~8.19~2024.10)
309+
eval $(opam config env --set-switch --switch CP.2024.10.1~8.19~2024.10)
305310
```
306311

307312
So you can easily open two separate shell windows, select different opam switches and start e.g. two CoqIDE instances to step through the same file with two different versions of Coq.
@@ -340,25 +345,25 @@ Please clarify the license at [CompCert License](https://github.com/AbsInt/CompC
340345
```
341346
~$ opam switch
342347
# switch compiler description
343-
CP.2024.10.0~8.12 ocaml-base-compiler.4.10.2 Coq 8.12.2 (released Dec 2020) with the first package pick from Dec 2020
344-
CP.2024.10.0~8.13~2021.02 ocaml-base-compiler.4.10.2 Coq 8.13.2 (released Apr 2021) with the first package pick from Feb 2021
345-
CP.2024.10.0~8.13~2021.09 ocaml-base-compiler.4.10.2 Coq 8.13.2 (released Apr 2021) with an extended package pick from Sep 2021
346-
CP.2024.10.0~8.13~2022.01 ocaml-base-compiler.4.10.2 Coq 8.13.2 (released Apr 2021) with an updated package pick from Jan 2022
347-
CP.2024.10.0~8.14~2022.01 ocaml-option-flambda.1,ocaml-variants.4.12.1+options Coq 8.14.1 (released Nov 2021) with the first package pick from Jan 2022
348-
CP.2024.10.0~8.14~2022.04 ocaml-option-flambda.1,ocaml-variants.4.12.1+options Coq 8.14.1 (released Nov 2021) with an updated package pick from Apr 2022
349-
CP.2024.10.0~8.15~2022.04 ocaml-option-flambda.1,ocaml-variants.4.13.1+options Coq 8.15.2 (released Jun 2022) with the first package pick from Apr 2022
350-
CP.2024.10.0~8.15~2022.09 ocaml-option-flambda.1,ocaml-variants.4.13.1+options Coq 8.15.2 (released Jun 2022) with an updated package pick from Sep 2022
351-
CP.2024.10.0~8.16~2022.09 ocaml-option-flambda.1,ocaml-variants.4.13.1+options Coq 8.16.1 (released Nov 2022) with the first package pick from Sep 2022
352-
CP.2024.10.0~8.16~2023.08 ocaml-option-flambda.1,ocaml-variants.4.14.1+options Coq 8.16.1 (released Nov 2022) with an updated package pick from from Aug 2023
353-
CP.2024.10.0~8.17~2023.08 ocaml-option-flambda.1,ocaml-variants.4.14.1+options Coq 8.17.1 (released Jun 2023) with the first package pick from Aug 2023
354-
CP.2024.10.0~8.18~2023.11 ocaml-option-flambda.1,ocaml-variants.4.14.1+options Coq 8.18.0 (released Sep 2023) with the first package pick from Nov 2023
355-
CP.2024.10.0~8.18~mc2 ocaml-option-flambda.1,ocaml-variants.4.14.1+options Coq 8.18.0 (released Sep 2023) with a package pick based on mathcomp 2.1
356-
→ CP.2024.10.0~8.19~2024.10 ocaml-option-flambda.1,ocaml-variants.4.14.2+options Coq 8.19.2 (released Jun 2024) with the first package pick from Oct 2024
357-
CP.2024.10.0~dev ocaml-option-flambda.1,ocaml-variants.4.13.1+options Coq dev (latest master of all packages)
348+
CP.2024.10.1~8.12 ocaml-base-compiler.4.10.2 Coq 8.12.2 (released Dec 2020) with the first package pick from Dec 2020
349+
CP.2024.10.1~8.13~2021.02 ocaml-base-compiler.4.10.2 Coq 8.13.2 (released Apr 2021) with the first package pick from Feb 2021
350+
CP.2024.10.1~8.13~2021.09 ocaml-base-compiler.4.10.2 Coq 8.13.2 (released Apr 2021) with an extended package pick from Sep 2021
351+
CP.2024.10.1~8.13~2022.01 ocaml-base-compiler.4.10.2 Coq 8.13.2 (released Apr 2021) with an updated package pick from Jan 2022
352+
CP.2024.10.1~8.14~2022.01 ocaml-option-flambda.1,ocaml-variants.4.12.1+options Coq 8.14.1 (released Nov 2021) with the first package pick from Jan 2022
353+
CP.2024.10.1~8.14~2022.04 ocaml-option-flambda.1,ocaml-variants.4.12.1+options Coq 8.14.1 (released Nov 2021) with an updated package pick from Apr 2022
354+
CP.2024.10.1~8.15~2022.04 ocaml-option-flambda.1,ocaml-variants.4.13.1+options Coq 8.15.2 (released Jun 2022) with the first package pick from Apr 2022
355+
CP.2024.10.1~8.15~2022.09 ocaml-option-flambda.1,ocaml-variants.4.13.1+options Coq 8.15.2 (released Jun 2022) with an updated package pick from Sep 2022
356+
CP.2024.10.1~8.16~2022.09 ocaml-option-flambda.1,ocaml-variants.4.13.1+options Coq 8.16.1 (released Nov 2022) with the first package pick from Sep 2022
357+
CP.2024.10.1~8.16~2023.08 ocaml-option-flambda.1,ocaml-variants.4.14.1+options Coq 8.16.1 (released Nov 2022) with an updated package pick from from Aug 2023
358+
CP.2024.10.1~8.17~2023.08 ocaml-option-flambda.1,ocaml-variants.4.14.1+options Coq 8.17.1 (released Jun 2023) with the first package pick from Aug 2023
359+
CP.2024.10.1~8.18~2023.11 ocaml-option-flambda.1,ocaml-variants.4.14.1+options Coq 8.18.0 (released Sep 2023) with the first package pick from Nov 2023
360+
CP.2024.10.1~8.18~mc2 ocaml-option-flambda.1,ocaml-variants.4.14.1+options Coq 8.18.0 (released Sep 2023) with a package pick based on mathcomp 2.1
361+
→ CP.2024.10.1~8.19~2024.10 ocaml-option-flambda.1,ocaml-variants.4.14.2+options Coq 8.19.2 (released Jun 2024) with the first package pick from Oct 2024
362+
CP.2024.10.1~dev ocaml-option-flambda.1,ocaml-variants.4.13.1+options Coq dev (latest master of all packages)
358363
```
359364
- Choose the switch you want to change with this command (example):
360365
```
361-
opam switch CP.2024.10.0~8.19~2024.10
366+
opam switch CP.2024.10.1~8.19~2024.10
362367
eval $(opam env)
363368
```
364369
- You can find packages with `opam list --all | grep "some keyword"`.

‎doc/FAQ-customized-installers.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ If you have issues, please contact us on zulip chat [Coq-Platform & users](https
5151

5252
After you created and built a new package pick, you can create a macOS DMG installer from it as follows:
5353

54-
- Activate the opam switch with `opam switch CP.2024.10.0~my_new_pick`
54+
- Activate the opam switch with `opam switch CP.2024.10.1~my_new_pick`
5555
- Navigate to your Coq Platform git folder, e.g. `cd ~/platform`
5656
- Run `macos/create_installer_macos.sh -sign=Y -signcert=path_to_certificate_file -signid=signature_id`
5757
- Above the `path_to_certificate_file` is the path and name of the `.cer` and `.p12` file **without** the file extension. The signature ID is typically the name of the institution to which the certificate is issued.
@@ -63,7 +63,7 @@ On recent macOS one can't start the application - that is CoqIDE - without signi
6363
After you created and built a new package pick, you can create a Windows installer from it as follows:
6464

6565
- Open the Coq Platform cygwin shell, e.g. `C:\bin\cygwin64_coq_platform\cygwin.bat`.
66-
- Activate the opam switch with `opam switch CP.2024.10.0~my_new_pick`
66+
- Activate the opam switch with `opam switch CP.2024.10.1~my_new_pick`
6767
- Navigate to the `coq-platform` folder.
6868
- Run `windows/create_installer_windows.sh`
6969

‎doc/README_Linux.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ This method is intended for experienced users, who may want to use opam to insta
1212
- OpenSuse: sudo zypper in -t pattern devel_C_C++
1313
- For CentOS and possibly RHEL some additional steps are required, see [CentOS](#centos) below.
1414
- Get the Coq Platform scripts via either of these methods
15-
- Most users should download and extract `https://github.com/coq/platform/archive/refs/tags/2024.10.0.zip`.
16-
- Users which intend to contribute to Coq Platform should use `git clone --branch 2024.10.0 https://github.com/coq/platform.git`.
15+
- Most users should download and extract `https://github.com/coq/platform/archive/refs/tags/2024.10.1.zip`.
16+
- Users which intend to contribute to Coq Platform should use `git clone --branch 2024.10.1 https://github.com/coq/platform.git`.
1717
- Open a shell, navigate to the download folder and execute `coq_platform_make.sh`.
1818
- The system will ask for sudo permissions to install prerequisites *several times* so the script is not fully unattended but all installations of dependencies are done directly after the initialization of the opam switch.
1919
- In case the script aborts e.g. cause of internet issues, just rerun the script.
20-
- The script creates a new opam switch named e.g. CP.2024.10.0~8.19~2024.10 - the exact name depends on the Coq version and package pick you selected.
20+
- The script creates a new opam switch named e.g. CP.2024.10.1~8.19~2024.10 - the exact name depends on the Coq version and package pick you selected.
2121
This means the script does not touch your existing opam setup unless you already have a switch of this name.
2222
- Use the following commands to activate this switch after opening a new shell:
23-
- `opam switch CP.2024.10.0~8.19~2024.10` (note: the switch name might vary if you choose a different version of Coq - please use `opam switch` to see a list of switch names)
23+
- `opam switch CP.2024.10.1~8.19~2024.10` (note: the switch name might vary if you choose a different version of Coq - please use `opam switch` to see a list of switch names)
2424
- `eval $(opam env)`
2525
- The second step can be automated by rerunning `opam init`
2626
- The main opam repositories for Coq and OCaml developments are already added to the created opam switch, so it should be easy to install additional Coq (or OCaml) packages.

‎doc/README_Windows.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ This method is intended for experienced users, who may want to use opam to insta
2222

2323
- In case you install **Coq Platform for the first time**:
2424
- Get the Coq Platform scripts via either of these methods
25-
- Most users should download and extract `https://github.com/coq/platform/archive/refs/tags/2024.10.0.zip`.
26-
- Users which intend to contribute to Coq Platform should use `git clone --branch 2024.10.0 https://github.com/coq/platform.git`.
25+
- Most users should download and extract `https://github.com/coq/platform/archive/refs/tags/2024.10.1.zip`.
26+
- Users which intend to contribute to Coq Platform should use `git clone --branch 2024.10.1 https://github.com/coq/platform.git`.
2727
Please note that the scripts are CR/LF sensitive, so if you use a Windows git client (not a Cygwin git) you should set `git config --global core.autocrlf false` - which is anyway a good idea.
2828
- Open a DOS command window, navigate to the download folder and execute `coq_platform_make_windows.bat`.
2929
- This will ask for the Cygwin installation path and setup a fresh Cygwin as build host (the created Coq is MinGW and runs without Cygwin).
@@ -34,26 +34,26 @@ This method is intended for experienced users, who may want to use opam to insta
3434
- Start a cygwin shell via `C:\<your_coq_platform_Cygwin_path>\Cygwin.bat`
3535
- Download, clone or pull the Coq Platform:
3636
- Download zip and expand:
37-
- `wget https://github.com/coq/platform/archive/refs/tags/2024.10.0.zip`
38-
- `unzip 2024.10.0.zip`
39-
- `mv 2024.10.0 platform-2024.10.0``
40-
- `cd platform-2024.10.0`
37+
- `wget https://github.com/coq/platform/archive/refs/tags/2024.10.1.zip`
38+
- `unzip 2024.10.1.zip`
39+
- `mv 2024.10.1 platform-2024.10.1``
40+
- `cd platform-2024.10.1`
4141
- **OR** Git clone:
42-
- `git clone --branch 2024.10.0 https://github.com/coq/platform.git`
42+
- `git clone --branch 2024.10.1 https://github.com/coq/platform.git`
4343
- `cd platform`
4444
- **OR** Git update (with existing git Coq Platform repo):
4545
- `cd platform`
46-
- `git fetch & git checkout 2024.10.0`
46+
- `git fetch & git checkout 2024.10.1`
4747
- Run the main Coq Platform installation script `coq_platform_make.sh`
4848
- The script will ask a few questions if no parameters are given and then run fully unattended.
4949
- The build time is between 1..5 hours, depending on CPU speed and RAM size.
5050
- In case the script aborts e.g. cause of internet issues, just rerun the batch file - it won't install Cygwin again (assuming you specify the same Cygwin destination folder).
5151
- The script has various options for configuring paths and proxies; see `example_coq_platform_make.bat` for an example command line.
5252
- The resulting Coq installation is opam based and best used from the Cygwin prompt (started via `C:\<your_coq_platform_Cygwin_path>\Cygwin.bat`)
53-
- The script creates a new opam switch named e.g. CP.2024.10.0~8.19~2024.10 - the exact name depends on the Coq version and package pick you selected you selected.
53+
- The script creates a new opam switch named e.g. CP.2024.10.1~8.19~2024.10 - the exact name depends on the Coq version and package pick you selected you selected.
5454
This means the script does not touch your existing opam setup unless you already have a switch of this name.
5555
- Use the following commands at the Cygwin prompt to activate this switch after opening a new shell:
56-
- `opam switch CP.2024.10.0~8.19~2024.10` (note: the switch name might vary if you choose a different version of Coq - please use `opam switch` to see a list of switch names)
56+
- `opam switch CP.2024.10.1~8.19~2024.10` (note: the switch name might vary if you choose a different version of Coq - please use `opam switch` to see a list of switch names)
5757
- `eval $(opam env)`
5858
- The second step can be automated by rerunning `opam init`
5959
- The main opam repositories for Coq and OCaml developments are already added to the created opam switch, so it should be easy to install additional Coq (or OCaml) packages.

0 commit comments

Comments
 (0)