Skip to content

Commit

Permalink
Bumped dune version to 2.7, induced cleaning of Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
ElectreAAS committed Jul 18, 2022
1 parent 40573ee commit 76531f4
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 18 deletions.
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ uninstall:

.PHONY: bench
bench:
@ dune build bench/bench.exe
@ dune build @bench-generic-sexp --force 2>&1 | dune exec bench/conversions.exe -- generic
@ dune build @bench-buffer-sexp --force 2>&1 | dune exec bench/conversions.exe -- buffer
@dune build --display=quiet @bench-generic-sexp --force
@dune build --display=quiet @bench-buffer-sexp --force

.PHONY: bench-local
bench-local:
Expand Down
22 changes: 12 additions & 10 deletions bench/dune
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,27 @@
(flags (-safe-string))
(libraries yojson core_bench core core_unix.command_unix core_bench.internals sexplib))

(alias
(name bench-generic)
(rule
(alias bench-generic)
(deps bench.json)
(action (run ./bench.exe generic)))

(alias
(name bench-generic-sexp)
(rule
(alias bench-generic-sexp)
(deps bench.json)
(action (run ./bench.exe generic -sexp)))
(action (pipe-stdout (run ./bench.exe generic -sexp)
(run ./conversions.exe -- generic))))

(alias
(name bench-buffer)
(rule
(alias bench-buffer)
(deps bench.json)
(action (run ./bench.exe buffer)))

(alias
(name bench-buffer-sexp)
(rule
(alias bench-buffer-sexp)
(deps bench.json)
(action (run ./bench.exe buffer -sexp)))
(action (pipe-stdout (run ./bench.exe buffer -sexp)
(run ./conversions.exe -- buffer))))

(alias
(name bench)
Expand Down
2 changes: 1 addition & 1 deletion dune-project
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
(lang dune 1.0)
(lang dune 2.7)
(name yojson)
4 changes: 2 additions & 2 deletions test/compliance/dune
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
)
)

(alias
(name compliance-tests)
(rule
(alias compliance-tests)
(deps
(:test test.exe)
(glob_files test_cases/*)
Expand Down
4 changes: 2 additions & 2 deletions test/pretty/dune
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
atd.output.json
(run ./atd.exe))))

(alias
(name runtest)
(rule
(alias runtest)
(action
(progn
(diff test.expected.json test.output.json)
Expand Down

0 comments on commit 76531f4

Please sign in to comment.