Skip to content

Commit

Permalink
finish conversion to dune, upgraded to opam 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mroch committed Jul 9, 2019
1 parent 71c6209 commit 77d40df
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 33 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ _build/
*.native
*.byte
*.install
*.swp
6 changes: 3 additions & 3 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
v1.1.0 2019-04-04
v1.1.0 2019-07-09
-----------------

Set the ocaml-migrate-parsetree priority to -10, so as to run before ppx_deriving
Switch from jbuilder to dune
- Set the ocaml-migrate-parsetree priority to -10, so as to run before ppx_deriving
- Switch from jbuilder to dune

v1.0.0 2018-07-06
-----------------
Expand Down
21 changes: 11 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,14 @@ licensed under the LICENSE file in the root directory of this source tree.

## Release Process

1. Install `topkg-care`: `opam install topkg-care topkg-jbuilder`
2. Review the changes since last version: `topkg status`
3. Write the release notes: `topkg log edit`
4. Commit the release notes: `topkg log commit`
5. Run some sanity checks: `topkg lint`
6. Tag the distribution with a version: `topkg tag`
7. Create the distribution archive: `topkg distrib`
8. Upload the archive to GitHub: `topkg publish distrib`
9. Create an opam package: `topkg opam pkg`
10. Submit it to OCaml's opam repository: `topkg opam submit`
1. Install `dune-release`: `opam install dune-release`
2. Update `CHANGES.md`, being careful to follow the existing format
3. Commit `CHANGES.md`
4. Run some sanity checks: `dune-release lint`
5. Tag the distribution with a version: `dune-release tag`
6. Create the distribution archive: `dune-release distrib`
7. Upload the archive to GitHub: `dune-release publish distrib`
8. Create an opam package: `dune-release opam pkg`
9. Submit it to OCaml's opam repository: `dune-release opam submit`

For more details, see `dune-release help release`.
2 changes: 2 additions & 0 deletions dune-project
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
(lang dune 1.0)
(name ppx_gen_rec)
21 changes: 13 additions & 8 deletions ppx_gen_rec.opam
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
opam-version: "1.2"
opam-version: "2.0"
maintainer: "Marshall Roch <[email protected]>"
authors: ["Marshall Roch <[email protected]>"]
homepage: "https://github.com/flowtype/ocaml-ppx_gen_rec"
doc: "https://github.com/flowtype/ocaml-ppx_gen_rec"
license: "MIT"
dev-repo: "https://github.com/flowtype/ocaml-ppx_gen_rec.git"
homepage: "https://github.com/flowtype/ocaml-ppx_gen_rec"
bug-reports: "https://github.com/flowtype/ocaml-ppx_gen_rec/issues"
depends:
[
depends: [
"ocaml"
"dune" {build}
"ocaml-migrate-parsetree" { >= "1.1.0" }
"ocaml-migrate-parsetree" {>= "1.1.0"}
]
build: [["dune" "build" "-p" name "-j" jobs]]
build: ["dune" "build" "-p" name "-j" jobs]
dev-repo: "git+https://github.com/flowtype/ocaml-ppx_gen_rec.git"
synopsis: "A ppx rewriter that transforms a recursive module expression into a `struct`"
description: """
In a recursive module expression, the struct can be derived from the signature automatically
by the compiler. This package does the same thing, but doing it this way allows ppx_deriving
to transform the signature and struct separately.
"""
6 changes: 6 additions & 0 deletions src/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
(library
(name ppx_gen_rec)
(public_name ppx_gen_rec)
(kind ppx_rewriter)
(libraries compiler-libs.common ocaml-migrate-parsetree)
(preprocess no_preprocessing))
12 changes: 0 additions & 12 deletions src/jbuild

This file was deleted.

0 comments on commit 77d40df

Please sign in to comment.