Skip to content

Commit

Permalink
Merge pull request #43 from jeffa5/chore/fixup-makefile
Browse files Browse the repository at this point in the history
Makefile: update jbuilder to dune
  • Loading branch information
smondet authored Jun 25, 2020
2 parents c65cb9b + 273aea8 commit aeb61ee
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 10 deletions.
23 changes: 13 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
all:
dune build @all

build:
jbuilder build
dune build

test:
jbuilder runtest
dune runtest

doc:
jbuilder build @doc
dune build @doc

clean:
jbuilder clean
dune clean

.PHONY: build test doc clean

Expand All @@ -17,13 +20,13 @@ 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)
opam publish submit $(NAME_VERSION)
rm -rf $(NAME_VERSION)
git tag -a v$(VERSION) -m "Version $(VERSION)."
git push origin v$(VERSION)
opam publish prepare $(NAME_VERSION) $(ARCHIVE)
opam publish submit $(NAME_VERSION)
rm -rf $(NAME_VERSION)

.PHONY: gh-pages release all-supported-ocaml-versions

all-supported-ocaml-versions:
jbuilder build @install @runtest --workspace jbuild-workspace.dev
dune build @install @runtest --workspace dune-workspace.dev
7 changes: 7 additions & 0 deletions dune-workspace.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
(lang dune 1.0)
;; This file is used by `make all-supported-ocaml-versions`
(context (opam (switch 4.04.0)))
(context (opam (switch 4.05.0)))
(context (opam (switch 4.06.0)))
(context (opam (switch 4.07.0)))
(context (opam (switch 4.08.0)))

0 comments on commit aeb61ee

Please sign in to comment.