Skip to content

Commit d4d16a9

Browse files
authored
Merge pull request #18 from edwintorok/dune
Move to dune and update opam dependencies
2 parents 9e5aa46 + 40dc653 commit d4d16a9

5 files changed

Lines changed: 19 additions & 19 deletions

File tree

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
.PHONY: build release install uninstall clean test doc reindent
22

33
build:
4-
jbuilder build @install --dev
4+
dune build @install
55

66
release:
7-
jbuilder build @install
7+
dune build @install --profile=release
88

99
install:
10-
jbuilder install
10+
dune install --profile=release
1111

1212
uninstall:
13-
jbuilder uninstall
13+
dune uninstall
1414

1515
clean:
16-
jbuilder clean
16+
dune clean
1717

1818
test:
19-
jbuilder runtest
19+
dune runtest --profile=release
2020

2121
# requires odoc
2222
doc:
23-
jbuilder build @doc
23+
dune build @doc --profile=release
2424

2525
reindent:
2626
ocp-indent --syntax cstruct -i **/*.ml*

dune-project

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
(lang dune 1.0)

lib/dune

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
(library
2+
(name backtrace)
3+
(public_name xapi-backtrace)
4+
(flags (:standard -w -39-32))
5+
(libraries
6+
rpclib rpclib.json threads)
7+
(preprocess (pps ppx_deriving_rpc ppx_sexp_conv)))

lib/jbuild

Lines changed: 0 additions & 9 deletions
This file was deleted.

xapi-backtrace.opam

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ bug-reports: "https://github.com/xapi-project/backtrace/issues"
66
dev-repo: "git://github.com/xapi-project/backtrace.git"
77
tags: [ "org:xapi-project" ]
88

9-
build: ["jbuilder" "build" "-p" name "-j" jobs]
9+
build: ["dune" "build" "-p" name "-j" jobs]
1010

1111
depends: [
12-
"jbuilder" {build}
12+
"dune" {build}
1313
"base-threads"
14+
"ppx_deriving_rpc"
1415
"ppx_sexp_conv" {>= "v0.11.0"}
15-
"rpc" {>= "1.9.51"}
16+
"rpclib"
1617
]

0 commit comments

Comments
 (0)