Skip to content

Commit

Permalink
Dune
Browse files Browse the repository at this point in the history
  • Loading branch information
Gary Trakhman authored and brendanlong committed Oct 26, 2018
1 parent 4ed38f8 commit d464c6b
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions Makefile
@@ -1,19 +1,19 @@
all: build

build:
@jbuilder build --dev @install @examples
@dune build @install @examples

clean:
@rm -rf `find . -name 'bisect*.out'` _coverage
@jbuilder clean
@dune clean

coverage: clean
@BISECT_ENABLE=YES jbuilder runtest
@BISECT_ENABLE=YES dune runtest
@bisect-ppx-report -I _build/default/ -html _coverage/ \
`find . -name 'bisect*.out'`

test:
@jbuilder runtest --force
@dune runtest --force

# until we have https://github.com/ocaml/opam-publish/issues/38
REPO=../opam-repository
Expand Down
6 changes: 3 additions & 3 deletions pgx.opam
Expand Up @@ -6,8 +6,8 @@ dev-repo: "https://github.com/arenadotio/pgx.git"
bug-reports: "https://github.com/arenadotio/pgx/issues"
doc: "https://arenadotio.github.io/pgx/doc"

build: ["jbuilder" "build" "-p" name "-j" jobs]
build-test: ["jbuilder" "runtest" "-p" name "-j" jobs]
build: ["dune" "build" "-p" name "-j" jobs]
build-test: ["dune" "runtest" "-p" name "-j" jobs]

depends: [
"ppx_jane"
Expand All @@ -16,7 +16,7 @@ depends: [
"sexplib0" {>= "v0.11.0"}

"bisect_ppx" {build & >= "1.3.1"}
"jbuilder" {build & >= "1.0+beta14"}
"dune" {build & >= "1.0.0"}

"base64" {test}
"ounit" {test}
Expand Down
4 changes: 2 additions & 2 deletions pgx_async.opam
Expand Up @@ -6,8 +6,8 @@ dev-repo: "https://github.com/arenadotio/pgx.git"
bug-reports: "https://github.com/arenadotio/pgx/issues"
doc: "https://arenadotio.github.io/pgx/doc"

build: ["jbuilder" "build" "-p" name "-j" jobs]
build-test: ["jbuilder" "runtest" "-p" name "-j" jobs]
build: ["dune" "build" "-p" name "-j" jobs]
build-test: ["dune" "runtest" "-p" name "-j" jobs]

depends: [
"async" {>= "v0.10.0"}
Expand Down
4 changes: 2 additions & 2 deletions pgx_lwt.opam
Expand Up @@ -6,8 +6,8 @@ dev-repo: "https://github.com/arenadotio/pgx.git"
bug-reports: "https://github.com/arenadotio/pgx/issues"
doc: "https://arenadotio.github.io/pgx/doc"

build: ["jbuilder" "build" "-p" name "-j" jobs]
build-test: ["jbuilder" "runtest" "-p" name "-j" jobs]
build: ["dune" "build" "-p" name "-j" jobs]
build-test: ["dune" "runtest" "-p" name "-j" jobs]

depends: [
"pgx"
Expand Down
4 changes: 2 additions & 2 deletions pgx_unix.opam
Expand Up @@ -6,8 +6,8 @@ dev-repo: "https://github.com/arenadotio/pgx.git"
bug-reports: "https://github.com/arenadotio/pgx/issues"
doc: "https://arenadotio.github.io/pgx/doc"

build: ["jbuilder" "build" "-p" name "-j" jobs]
build-test: ["jbuilder" "runtest" "-p" name "-j" jobs]
build: ["dune" "build" "-p" name "-j" jobs]
build-test: ["dune" "runtest" "-p" name "-j" jobs]

depends: [
"pgx"
Expand Down

0 comments on commit d464c6b

Please sign in to comment.