Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for Dune-Coq 0.8 and Coq 8.17 #7

Open
wants to merge 3 commits into
base: v8.16
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 0 additions & 48 deletions .github/workflows/ci.yml

This file was deleted.

30 changes: 30 additions & 0 deletions .github/workflows/docker-action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Docker CI

on:
push:
branches:
- 'v8.17+0.8'
pull_request:
branches:
- '**'

jobs:
build:
# the OS must be GNU/Linux to be able to use the docker-coq-action
runs-on: ubuntu-latest
strategy:
matrix:
image:
- 'coqorg/coq:dev-ocaml-4.14-flambda'
- 'coqorg/coq:8.17.1-ocaml-4.09.1-flambda'
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: coq-community/docker-coq-action@v1
with:
opam_file: 'coq-my-plugin.opam'
custom_image: ${{ matrix.image }}

# See also:
# https://github.com/coq-community/docker-coq-action#readme
# https://github.com/erikmd/docker-coq-github-action-demo
4 changes: 0 additions & 4 deletions CHANGES

This file was deleted.

71 changes: 38 additions & 33 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,55 +1,60 @@
# Template for Coq Plugins using Dune
# Coq Plugin Template using Dune

This repository contains a template for writing a plugin for the
[![Docker CI][docker-action-shield]][docker-action-link]

[docker-action-shield]: https://github.com/coq-community/coq-plugin-template/workflows/Docker%20CI/badge.svg?branch=v8.17
[docker-action-link]: https://github.com/coq-community/coq-plugin-template/actions?query=workflow:"Docker%20CI"

Template repository writing a plugin in [OCaml](https://ocaml.org) for the
[Coq](https://coq.inria.fr) proof assistant using the [Dune](https://dune.build)
build system. It showcases a few advanced features such as linking to C code or
to external libraries.

The current version is tested (and requires):

- Dune 2.9
- Coq 8.16

Minimal historical requirements are Coq 8.9 and Dune 1.10, but they
are not supported anymore. See template history / branches for
changes at your own risk.
## Meta

See the [Dune documentation](https://dune.readthedocs.io/en/latest/) for more help.
- License: [Unlicense](LICENSE) (change to your license of choice)
- Compatible Coq versions: 8.17.1 or later
- Additional dependencies:
- [Dune](https://dune.build) 3.8.2 or later
- Coq namespace: `MyPlugin`

## See also

The [official tutorial](https://github.com/coq/coq/tree/master/doc/plugin_tutorial)
for writing Coq plugins in the Coq repository, which already includes `dune` files
for OCaml parts.

## How to build
## Building instructions

To install dependencies via [opam](https://opam.ocaml.org/doc/Install.html):
```shell
$ dune build
$ opam install dune.3.8.2 coq.8.17.1
```
and the rest of the regular Dune commands. To test your library, you can use

To build the plugin when all dependencies are installed:
```shell
$ dune exec -- coqtop -R _build/default/theories MyPlugin
$ dune build
```

or starting with Dune 3.2
The plugin can be tested manually:
```shell
$ dune coq top theories/Test.v
```

## Releasing OPAM packages
Welcome to Coq 8.17.1

You can use
[`dune-release`](https://github.com/ocamllabs/dune-release) to
automatically release OPAM packages.
Coq < Require Import MyPlugin.
[Loading ML file my_plugin.cmxs (using legacy method) ... done]

For that, you need to update the included `.opam` file, and configure
your Github tokens as described in the documentation of `dune-release`.
Coq < CallC.
Toplevel input, characters 0-6:
> CallC.
> ^^^^^^
Warning: 546
```

## Linking with external libraries
See also the [Dune documentation](https://dune.readthedocs.io/en/latest/) for more help,
and the [official tutorial](https://github.com/coq/coq/tree/master/doc/plugin_tutorial)
for writing Coq plugins in the Coq repository which already includes `dune` files
for the OCaml parts.

Starting with Coq 8.16, Coq will load dependencies of your
plugin. This requires that your plugin is named as a findlib package.
## Releasing opam packages

See [Coq documentation](https://coq.github.io/doc/master/refman/proof-engine/vernacular-commands.html#coq:cmd.Declare-ML-Module) for more information.
You can use [`dune-release`](https://github.com/tarides/dune-release) to
automatically release opam packages.

For that, you need to update the included `.opam` file, and configure
your Github tokens as described in the documentation of `dune-release`.
17 changes: 9 additions & 8 deletions coq-my-plugin.opam
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
opam-version: "2.0"
maintainer: "[email protected]"
version: "dev"

homepage: "https://github.com/your-github/my-plugin"
dev-repo: "git+https://github.com/your-github/my-plugin.git"
bug-reports: "https://github.com/your-github/my-plugin/issues"
doc: "https://your-github.github.io/my-plugin"
license: "MIT"
homepage: "https://github.com/coq-community/my-plugin"
dev-repo: "git+https://github.com/coq-community/my-plugin.git"
bug-reports: "https://github.com/coq-community/my-plugin/issues"
doc: "https://coq-community.github.io/my-plugin"
license: "SPDX-identifier-for-your-license"

synopsis: "One line description of your plugin"
description: """
Expand All @@ -14,9 +15,9 @@ cover multiple lines. Including punctuation."""

build: ["dune" "build" "-p" name "-j" jobs]
depends: [
"ocaml" {>= "4.07.1"}
"dune" {>= "2.5"}
"coq" {>= "8.14" & < "8.15"}
"ocaml" {>= "4.09.0"}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe better to use a more recent OCaml version? I suggest 4.14.1

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But 4.14.1 isn't required, right? I thought we keep this the lower bound.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No it is not. That's a good question about what versions we put here. In general it will depend on the OCaml features the plugin writer uses.

Note also that 8.17.0 is not either a lower bound here, as the template works fine with 8.16.x

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As dicussed in Zulip, generally a template has a range of versions that it is suitable for, so we may want just to document the ranges users can do here.

  • In the case of Coq, for this version of the template >= 8.16 , tho it is trivial to adapt for 8.14, 8.15
  • In the case of OCaml, the bound is basically any OCaml in the 4.x series

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR doesn't work on Coq 8.16 since I removed -rectypes.

"dune" {>= "3.8.2"}
"coq" {>= "8.17.1"}
]

tags: [
Expand Down
4 changes: 2 additions & 2 deletions dune-project
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
(lang dune 2.9)
(using coq 0.3)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While we are at it we can use (generate_opam_files) and (opam_file_location)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem with opam file generation is that it brings another level of indirection. I think it's easier if we just keep the opam files manual...

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leaving the opam files manual is OK but has quite a few downsides too, in particular newer dune offers nice stuff if you declare the packages on dune-package, like source download, on top of the user having now to learn both opam syntax and dune syntax.

On other other hand, I can't see see any problem in the workflow with automatic file generation, what problems do you foresee? I don't understand what kind of indirection you refer to.

In fact the only reason that opam files need to be committed to the repository is due to "pinning", which is not yet smart enough to generate them on the fly. If you don't care about pinning you don't need to commit the .opam files and you can just ignore them, as dune-release will take care of properly generating them for repos upload.

(lang dune 3.8)
(using coq 0.8)
(name my-plugin)
12 changes: 4 additions & 8 deletions src/dune
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,14 @@

(synopsis "My Coq plugin") ; Synopsis, used in META generation.

(flags :standard -rectypes -w -27) ; Coq requires the `-rectypes`
; flag; CoqPP generated code
; requires to disable warning 27
; often.
(flags :standard -w -27) ; CoqPP generated code requires to
; disable warning 27 often.
palmskog marked this conversation as resolved.
Show resolved Hide resolved

(foreign_stubs ; we link our plugin with a C
(foreign_stubs ; We link our plugin with a C
(language c) ; library! Optional, of course.
(names ce_get))

(libraries ; OCaml Libraries we want to link
; with, your choice here.

(libraries ; OCaml libraries we want to link with
coq-core.vernac ; Needed for vernac extend.
coq-core.plugins.ltac ; Needed for tactic extend.
)
Expand Down
2 changes: 1 addition & 1 deletion theories/dune
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
(package coq-my-plugin) ; Adding this line will make your
; library installable in the opam package

(libraries coq-my-plugin.plugin)) ; Here you should declare all
(plugins coq-my-plugin.plugin)) ; Here you should declare all
; OCaml plugin dependencies
; for your Coq files.

Expand Down