Merge pull request #53 from rgrinberg/dune

Port to dune 2.7

Author: rgrinberg

dune-project

@@ -1,3 +1,29 @@
-(lang dune 1.4)
+(lang dune 2.7)
 (name mustache)
 (using menhir 2.0)
+
+(license MIT)
+(implicit_transitive_deps false)
+
+(maintainers "Rudi Grinberg <[email protected]>")
+(authors
+ "Rudi Grinberg <[email protected]>"
+ "Armaël Guéneau <[email protected]>"
+ "Gabriel Scherer <[email protected]>")
+
+(source (github rgrinberg/ocaml-mustache))
+
+(generate_opam_files true)
+
+(package
+ (name mustache)
+ (synopsis "Mustache logic-less templates in OCaml")
+ (description "
+Read and write mustache templates, and render them by providing a json object.
+Contains the `mustache` command line utility for driving logic-less templates.
+")
+ (depends
+  ezjsonm
+  (ounit :with-test)
+  (menhir (>= 20180703))
+  (ocaml (>= 4.06))))

lib_test/dune

@@ -1,14 +1,5 @@
-(executables
+(tests
+ (libraries mustache ounit2 ezjsonm)
  (names test_mustache spec_mustache)
- (libraries mustache oUnit ezjsonm))
-
-(alias
- (name runtest)
  (deps test_mustache.exe ../specs/comments.json ../specs/interpolation.json
-   ../specs/partials.json ../specs/sections.json ../specs/inverted.json)
- (action (run ./test_mustache.exe)))
-
-(alias
- (name runtest)
- (deps spec_mustache.exe)
- (action (run %{deps})))
+   ../specs/partials.json ../specs/sections.json ../specs/inverted.json))

mustache.opam

@@ -1,25 +1,40 @@
+# This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-maintainer: "[email protected]"
-authors: ["Rudi Grinberg" "Armaël Guéneau"]
+synopsis: "Mustache logic-less templates in OCaml"
+description: """
+
+Read and write mustache templates, and render them by providing a json object.
+Contains the `mustache` command line utility for driving logic-less templates.
+"""
+maintainer: ["Rudi Grinberg <[email protected]>"]
+authors: [
+  "Rudi Grinberg <[email protected]>"
+  "Armaël Guéneau <[email protected]>"
+  "Gabriel Scherer <[email protected]>"
+]
 license: "MIT"
 homepage: "https://github.com/rgrinberg/ocaml-mustache"
-doc: "http://rgrinberg.github.io/mustache/"
 bug-reports: "https://github.com/rgrinberg/ocaml-mustache/issues"
 depends: [
-  "ocaml" {>= "4.08.0"}
-  "dune" {>= "1.4.0"}
+  "dune" {>= "2.7"}
   "ezjsonm"
-  "menhir" {>= "20180703"}
   "ounit" {with-test}
+  "menhir" {>= "20180703"}
+  "ocaml" {>= "4.06"}
+  "odoc" {with-doc}
 ]
 build: [
-  ["dune" "subst"] {pinned}
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
 ]
 dev-repo: "git+https://github.com/rgrinberg/ocaml-mustache.git"
-synopsis: "Mustache logic-less templates in OCaml"
-description: """
-Read and write mustache templates, and render them by providing a json object.
-Contains the `mustache` command line utility for driving logic-less templates.
-"""