Merge pull request #9 from kit-ty-kate/release-2.1

Prepare release 2.1
ocaml-ppx · Oct 23, 2020 · eb6cb4b · eb6cb4b
2 parents e4adf6e + ff0ca57
commit eb6cb4b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 39 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGES.md 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`.
diff --git 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
diff --git 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 <whitequark@whitequark.org>")

diff --git 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 <whitequark@whitequark.org>"]
 authors: ["whitequark <whitequark@whitequark.org>"]