Skip to content

Commit

Permalink
Go full Dune
Browse files Browse the repository at this point in the history
Switch to Dune file syntax

 - Fewer parentheses
 - name defaults to same as public_name in Dune 1.1
 - I removed some unnecessary (wrapped false) annotations in libraries
   with only one file
  • Loading branch information
brendanlong committed Oct 26, 2018
1 parent 00eb47a commit a77433b
Show file tree
Hide file tree
Showing 23 changed files with 81 additions and 106 deletions.
1 change: 1 addition & 0 deletions dune-project
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(lang dune 1.1)
Empty file removed jbuild-workspace
Empty file.
2 changes: 1 addition & 1 deletion pgx.opam
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ depends: [
"sexplib0" {>= "v0.11.0"}

"bisect_ppx" {build & >= "1.3.1"}
"dune" {build & >= "1.0.0"}
"dune" {build & >= "1.1.0"}

"base64" {test}
"ounit" {test}
Expand Down
6 changes: 6 additions & 0 deletions pgx/src/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
(library
(public_name pgx)
(wrapped false)
(inline_tests (flags (-verbose)))
(libraries uuidm re sexplib0)
(preprocess (pps ppx_jane bisect_ppx -conditional)))
9 changes: 0 additions & 9 deletions pgx/src/jbuild

This file was deleted.

10 changes: 10 additions & 0 deletions pgx/test/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
(executables
(names test_pgx_value)
(libraries pgx oUnit)
(preprocess (pps ppx_jane)))

(alias
(name runtest)
(package pgx)
(deps (:exe test_pgx_value.exe))
(action (run %{exe})))
12 changes: 0 additions & 12 deletions pgx/test/jbuild

This file was deleted.

8 changes: 8 additions & 0 deletions pgx_async/bin/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
(executables
(names pgx_async_example)
(libraries core async pgx_async)
(preprocess (pps ppx_jane)))

(alias
(name examples)
(deps pgx_async_example.exe))
10 changes: 0 additions & 10 deletions pgx_async/bin/jbuild

This file was deleted.

6 changes: 6 additions & 0 deletions pgx_async/src/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
(library
(public_name pgx_async)
(wrapped false)
(flags (:standard -safe-string))
(libraries async pgx)
(preprocess (pps bisect_ppx -conditional ppx_jane)))
9 changes: 0 additions & 9 deletions pgx_async/src/jbuild

This file was deleted.

16 changes: 16 additions & 0 deletions pgx_async/test/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
(executables
(names test_pgx_async test_pgx_async_conversions)
(libraries pgx_async pgx_test oUnit)
(preprocess (pps ppx_jane)))

(alias
(name runtest)
(package pgx_async)
(deps (:exe test_pgx_async.exe))
(action (run %{exe})))

(alias
(name runtest)
(package pgx_async)
(deps (:exe test_pgx_async_conversions.exe))
(action (run %{exe})))
18 changes: 0 additions & 18 deletions pgx_async/test/jbuild

This file was deleted.

5 changes: 5 additions & 0 deletions pgx_lwt/src/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(library
(public_name pgx_lwt)
(wrapped false)
(libraries lwt lwt.unix pgx)
(preprocess (pps bisect_ppx -conditional ppx_jane)))
8 changes: 0 additions & 8 deletions pgx_lwt/src/jbuild

This file was deleted.

10 changes: 10 additions & 0 deletions pgx_lwt/test/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
(executable
(name test_pgx_lwt)
(libraries pgx_test pgx_lwt)
(preprocess (pps ppx_jane)))

(alias
(name runtest)
(package pgx_lwt)
(deps (:exe test_pgx_lwt.exe))
(action (run %{exe})))
12 changes: 0 additions & 12 deletions pgx_lwt/test/jbuild

This file was deleted.

4 changes: 4 additions & 0 deletions pgx_test/src/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
(library
(name pgx_test)
(libraries base64 pgx oUnit)
(preprocess (pps ppx_jane)))
7 changes: 0 additions & 7 deletions pgx_test/src/jbuild

This file was deleted.

4 changes: 4 additions & 0 deletions pgx_unix/src/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
(library
(public_name pgx_unix)
(libraries pgx)
(preprocess (pps bisect_ppx -conditional ppx_jane)))
8 changes: 0 additions & 8 deletions pgx_unix/src/jbuild

This file was deleted.

10 changes: 10 additions & 0 deletions pgx_unix/test/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
(executable
(name test_pgx_unix)
(libraries pgx_test pgx_unix)
(preprocess (pps ppx_jane)))

(alias
(name runtest)
(package pgx_unix)
(deps (:exe test_pgx_unix.exe))
(action (run %{exe})))
12 changes: 0 additions & 12 deletions pgx_unix/test/jbuild

This file was deleted.

0 comments on commit a77433b

Please sign in to comment.