Skip to content

Commit

Permalink
Housecleaning: move to Dune and fix compilation warnings (#2149)
Browse files Browse the repository at this point in the history
* Housecleaning: move to Dune and fix compilation warnings

* Fix tests

* revert warning 9 changes

* Esy workflow
  • Loading branch information
anmonteiro authored and jordwalke committed Aug 20, 2018
1 parent 2c5fdbe commit bb998eb
Show file tree
Hide file tree
Showing 43 changed files with 414 additions and 495 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SHELL=bash -o pipefail
default: build

build:
jbuilder build
dune build

install:
opam pin add reason . -y
Expand Down Expand Up @@ -43,7 +43,7 @@ all_errors:
# Not all versions of jbuilder have the clean command.
# jbuilder clean
clean: clean-tests
jbuilder clean
dune clean

# The jbuilder that gets installed on CI doesn't have the make clean
# command yet.
Expand Down Expand Up @@ -89,6 +89,6 @@ release: release_check pre_release

all-supported-ocaml-versions:
# the --dev flag has been omitted here but should be re-introduced eventually
jbuilder build @install @runtest --workspace jbuild-workspace.dev --root .
dune build @install @runtest --root .

.PHONY: all-supported-ocaml-versions
4 changes: 4 additions & 0 deletions dune-project
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
(lang dune 1.1)


(using menhir 1.0)
6 changes: 3 additions & 3 deletions esy.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@opam/result": "*",
"@opam/ocaml-migrate-parsetree": "*",
"@opam/ocamlbuild": "*",
"@opam/jbuilder": "*"
"@opam/dune": "*"
},
"peerDependencies": {
"ocaml": " >= 4.2.0 < 4.7.0"
Expand All @@ -32,7 +32,7 @@
],
"esy": {
"build": [
[ "jbuilder", "build", "-p", "reason,rtop"]
[ "dune", "build", "-p", "reason,rtop"]
],
"install": [
["esy-installer", "reason.install"],
Expand All @@ -49,7 +49,7 @@
"@opam/result": "*",
"@opam/ocaml-migrate-parsetree": "*",
"@opam/ocamlbuild": "*",
"@opam/jbuilder": "*"
"@opam/dune": "*"
}
}
}
Loading

0 comments on commit bb998eb

Please sign in to comment.