Skip to content

Commit

Permalink
Merge pull request #448 from MSoegtropIMC/release-2024.10.1
Browse files Browse the repository at this point in the history
Prepare bug-fix release to adjust to opam 2.3.0
  • Loading branch information
MSoegtropIMC authored Dec 2, 2024
2 parents 1a7db05 + 8b4adbd commit 7c4352c
Show file tree
Hide file tree
Showing 36 changed files with 229 additions and 195 deletions.
71 changes: 38 additions & 33 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ The Coq Platform team does no double check this information.

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

## Changes in 2024.10.1

This is a "source only" bugfix release which addresses changes in the opam file format in opam 2.3.0.
The installers and package pick lists are unmodified from the previous release.

## Changes in 2024.10.0

- added new pick 8.19~2024.10
Expand Down Expand Up @@ -277,31 +282,31 @@ You can list the available switches with:
```
~$ opam switch
# switch compiler description
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
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
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
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
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
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
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
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
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
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
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
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
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
→ 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
CP.2024.10.0~dev ocaml-option-flambda.1,ocaml-variants.4.13.1+options Coq dev (latest master of all packages)
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
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
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
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
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
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
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
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
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
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
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
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
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
→ 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
CP.2024.10.1~dev ocaml-option-flambda.1,ocaml-variants.4.13.1+options Coq dev (latest master of all packages)
```

You can select the opam switch for **all shells** with e.g.:
```
~$ opam switch CP.2024.10.0~8.19~2024.10
~$ opam switch CP.2024.10.1~8.19~2024.10
```

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

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.
Expand Down Expand Up @@ -340,25 +345,25 @@ Please clarify the license at [CompCert License](https://github.com/AbsInt/CompC
```
~$ opam switch
# switch compiler description
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
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
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
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
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
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
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
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
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
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
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
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
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
→ 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
CP.2024.10.0~dev ocaml-option-flambda.1,ocaml-variants.4.13.1+options Coq dev (latest master of all packages)
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
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
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
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
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
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
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
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
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
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
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
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
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
→ 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
CP.2024.10.1~dev ocaml-option-flambda.1,ocaml-variants.4.13.1+options Coq dev (latest master of all packages)
```
- Choose the switch you want to change with this command (example):
```
opam switch CP.2024.10.0~8.19~2024.10
opam switch CP.2024.10.1~8.19~2024.10
eval $(opam env)
```
- You can find packages with `opam list --all | grep "some keyword"`.
Expand Down
4 changes: 2 additions & 2 deletions doc/FAQ-customized-installers.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ If you have issues, please contact us on zulip chat [Coq-Platform & users](https

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

- Activate the opam switch with `opam switch CP.2024.10.0~my_new_pick`
- Activate the opam switch with `opam switch CP.2024.10.1~my_new_pick`
- Navigate to your Coq Platform git folder, e.g. `cd ~/platform`
- Run `macos/create_installer_macos.sh -sign=Y -signcert=path_to_certificate_file -signid=signature_id`
- 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.
Expand All @@ -63,7 +63,7 @@ On recent macOS one can't start the application - that is CoqIDE - without signi
After you created and built a new package pick, you can create a Windows installer from it as follows:

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

Expand Down
8 changes: 4 additions & 4 deletions doc/README_Linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ This method is intended for experienced users, who may want to use opam to insta
- OpenSuse: sudo zypper in -t pattern devel_C_C++
- For CentOS and possibly RHEL some additional steps are required, see [CentOS](#centos) below.
- Get the Coq Platform scripts via either of these methods
- Most users should download and extract `https://github.com/coq/platform/archive/refs/tags/2024.10.0.zip`.
- Users which intend to contribute to Coq Platform should use `git clone --branch 2024.10.0 https://github.com/coq/platform.git`.
- Most users should download and extract `https://github.com/coq/platform/archive/refs/tags/2024.10.1.zip`.
- Users which intend to contribute to Coq Platform should use `git clone --branch 2024.10.1 https://github.com/coq/platform.git`.
- Open a shell, navigate to the download folder and execute `coq_platform_make.sh`.
- 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.
- In case the script aborts e.g. cause of internet issues, just rerun the script.
- 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.
- 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.
This means the script does not touch your existing opam setup unless you already have a switch of this name.
- Use the following commands to activate this switch after opening a new shell:
- `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)
- `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)
- `eval $(opam env)`
- The second step can be automated by rerunning `opam init`
- 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.
Expand Down
20 changes: 10 additions & 10 deletions doc/README_Windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ This method is intended for experienced users, who may want to use opam to insta

- In case you install **Coq Platform for the first time**:
- Get the Coq Platform scripts via either of these methods
- Most users should download and extract `https://github.com/coq/platform/archive/refs/tags/2024.10.0.zip`.
- Users which intend to contribute to Coq Platform should use `git clone --branch 2024.10.0 https://github.com/coq/platform.git`.
- Most users should download and extract `https://github.com/coq/platform/archive/refs/tags/2024.10.1.zip`.
- Users which intend to contribute to Coq Platform should use `git clone --branch 2024.10.1 https://github.com/coq/platform.git`.
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.
- Open a DOS command window, navigate to the download folder and execute `coq_platform_make_windows.bat`.
- 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).
Expand All @@ -34,26 +34,26 @@ This method is intended for experienced users, who may want to use opam to insta
- Start a cygwin shell via `C:\<your_coq_platform_Cygwin_path>\Cygwin.bat`
- Download, clone or pull the Coq Platform:
- Download zip and expand:
- `wget https://github.com/coq/platform/archive/refs/tags/2024.10.0.zip`
- `unzip 2024.10.0.zip`
- `mv 2024.10.0 platform-2024.10.0``
- `cd platform-2024.10.0`
- `wget https://github.com/coq/platform/archive/refs/tags/2024.10.1.zip`
- `unzip 2024.10.1.zip`
- `mv 2024.10.1 platform-2024.10.1``
- `cd platform-2024.10.1`
- **OR** Git clone:
- `git clone --branch 2024.10.0 https://github.com/coq/platform.git`
- `git clone --branch 2024.10.1 https://github.com/coq/platform.git`
- `cd platform`
- **OR** Git update (with existing git Coq Platform repo):
- `cd platform`
- `git fetch & git checkout 2024.10.0`
- `git fetch & git checkout 2024.10.1`
- Run the main Coq Platform installation script `coq_platform_make.sh`
- The script will ask a few questions if no parameters are given and then run fully unattended.
- The build time is between 1..5 hours, depending on CPU speed and RAM size.
- 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).
- The script has various options for configuring paths and proxies; see `example_coq_platform_make.bat` for an example command line.
- The resulting Coq installation is opam based and best used from the Cygwin prompt (started via `C:\<your_coq_platform_Cygwin_path>\Cygwin.bat`)
- 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.
- 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.
This means the script does not touch your existing opam setup unless you already have a switch of this name.
- Use the following commands at the Cygwin prompt to activate this switch after opening a new shell:
- `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)
- `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)
- `eval $(opam env)`
- The second step can be automated by rerunning `opam init`
- 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.
Expand Down
Loading

0 comments on commit 7c4352c

Please sign in to comment.