From e3ee14d6ef863460979fe47fe1015ad082fb02f5 Mon Sep 17 00:00:00 2001 From: Kate Date: Fri, 23 Oct 2020 15:02:11 +0100 Subject: [PATCH 1/4] Update Makefile --- Makefile | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index f74af1e..922638f 100644 --- a/Makefile +++ b/Makefile @@ -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 From f6ec3e8f366c20acead6243537ffe2fd22027641 Mon Sep 17 00:00:00 2001 From: Kate Date: Fri, 23 Oct 2020 16:44:51 +0100 Subject: [PATCH 2/4] Add a changelog --- CHANGES.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 CHANGES.md diff --git a/CHANGES.md b/CHANGES.md new file mode 100644 index 0000000..7f7d544 --- /dev/null +++ b/CHANGES.md @@ -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`. From e473093203bff0a6ab2e38b1933234367d906dbf Mon Sep 17 00:00:00 2001 From: Kate Date: Fri, 23 Oct 2020 17:27:22 +0100 Subject: [PATCH 3/4] Prepare release 2.1 --- dune-project | 3 ++- ppx_getenv.opam | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dune-project b/dune-project index d0e7bad..00012c4 100644 --- a/dune-project +++ b/dune-project @@ -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 ") diff --git a/ppx_getenv.opam b/ppx_getenv.opam index f19d89c..c490f0f 100644 --- a/ppx_getenv.opam +++ b/ppx_getenv.opam @@ -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 "] authors: ["whitequark "] From ff0ca577d14724d386d1fbedabba66274a55512c Mon Sep 17 00:00:00 2001 From: Kate Date: Fri, 23 Oct 2020 17:38:52 +0100 Subject: [PATCH 4/4] Use ocaml-ci instead of travis --- .travis.yml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 9ff486b..0000000 --- a/.travis.yml +++ /dev/null @@ -1,15 +0,0 @@ -language: c -install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh -script: bash -ex .travis-opam.sh -env: - global: - - PACKAGE="ppx_getenv" - matrix: - - OCAML_VERSION=4.04 - - OCAML_VERSION=4.05 - - OCAML_VERSION=4.06 - - OCAML_VERSION=4.07 - - OCAML_VERSION=4.08 - - OCAML_VERSION=4.09 - - OCAML_VERSION=4.10 - - OCAML_VERSION=4.11