Skip to content

Commit

Permalink
Merge pull request #9 from kit-ty-kate/release-2.1
Browse files Browse the repository at this point in the history
Prepare release 2.1
  • Loading branch information
kit-ty-kate authored Oct 23, 2020
2 parents e4adf6e + ff0ca57 commit eb6cb4b
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 39 deletions.
15 changes: 0 additions & 15 deletions .travis.yml

This file was deleted.

12 changes: 12 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
v2.1 (23/10/2020)
-----------------

- Upgrade to ppxlib 0.18.0 (#8, @NathanReb)

v2.0 (12/08/2020)
-----------------

- Switch from `topkg`/`ocamlbuild` to `dune` (#6, @kit-ty-kate)
- Switch from `ppx_tools` to `ppxlib` (#6, #7, @kit-ty-kate)

These changes bring OCaml 4.11 support as well as the ability to use `ppx_getenv` directly in `dune`.
26 changes: 4 additions & 22 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,28 +1,10 @@
build:
cp pkg/META.in pkg/META
ocaml pkg/build.ml native=true native-dynlink=true
dune build

test: build
rm _build/src_test/ -rf
ocamlbuild -classic-display -use-ocamlfind src_test/test_ppx_getenv.byte --
test:
dune runtest -f

clean:
ocamlbuild -clean
rm pkg/META
dune clean

.PHONY: build test clean

VERSION := $$(opam query --version)
NAME_VERSION := $$(opam query --name-version)
ARCHIVE := $$(opam query --archive)

release:
git tag -a v$(VERSION) -m "Version $(VERSION)."
git push origin v$(VERSION)
opam publish prepare $(NAME_VERSION) $(ARCHIVE)
cp -t $(NAME_VERSION) descr
grep -Ev '^(name|version):' opam >$(NAME_VERSION)/opam
opam publish submit $(NAME_VERSION)
rm -rf $(NAME_VERSION)

.PHONY: release
3 changes: 2 additions & 1 deletion dune-project
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
(lang dune 2.0)
(name ppx_getenv)
(version 2.0)
(version 2.1)

(formatting disabled)
(generate_opam_files true)

(maintainers "whitequark <[email protected]>")
Expand Down
2 changes: 1 addition & 1 deletion ppx_getenv.opam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
version: "2.0"
version: "2.1"
synopsis: "A sample syntax extension using OCaml's new extension points API"
maintainer: ["whitequark <[email protected]>"]
authors: ["whitequark <[email protected]>"]
Expand Down

0 comments on commit eb6cb4b

Please sign in to comment.