Dune & dune-release

Makefile

@@ -1,21 +1,30 @@
+.PHONY: all
 all:
-	@jbuilder build @install @DEFAULT
+	@dune build @install @examples
 
+.PHONY: run-examples
+run-examples:
+	dune exec examples/filtering.exe < examples/filtering.json
+
+.PHONY: test
 test:
-	@jbuilder runtest
+	@dune runtest --force
 
+.PHONY: check
 check: test
 
+.PHONY: install
 install:
-	@jbuilder install
+	@dune install
 
+.PHONY: uninstall
 uninstall:
-	@jbuilder uninstall
+	@dune uninstall
 
+.PHONY: bench
 bench:
-	@jbuilder build bench/bench.exe
-
-.PHONY: clean all bench test check install uninstall
+	@dune build bench/bench.exe
 
+.PHONY: clean
 clean:
-	jbuilder clean
+	@dune clean

README.md

@@ -6,9 +6,7 @@ _This library is for manipulating the json AST directly. For mapping between OCa
 Library documentation
 ---------------------
 
-Currently at https://mjambon.github.io/mjambon2016/yojson-doc/Yojson.html
-
-_The link above is for the ocamldoc-generated of some past version of yojson. Suggestions on how to keep this documentation updated automatically for each minor release are welcome._
+Currently at https://ocaml-community.github.io/yojson/
 
 Design goals
 ------------

bench/dune

@@ -0,0 +1,5 @@
+;; doesn't actually build b/c json_io doesn't exist
+(executable
+ (name bench)
+ (flags (-safe-string))
+ (libraries yojson))

bin/dune

@@ -0,0 +1,5 @@
+(executable
+ (name ydump)
+ (public_name ydump)
+ (flags (-safe-string))
+ (libraries yojson))

dune-project

@@ -0,0 +1 @@
+(lang dune 1.0)

examples/dune

@@ -0,0 +1,8 @@
+(executables
+ (names filtering)
+ (flags (-safe-string))
+ (libraries yojson))
+
+(alias
+ (name examples)
+ (deps filtering.exe))

examples/filtering.ml

@@ -1,6 +1,5 @@
 (*
-  ocamlfind ocamlopt -o filtering filtering.ml -package yojson -linkpkg
-  ./filtering <<EOF
+  dune exec examples/filtering.exe <<EOF
 {
   "id": "398eb027",
   "name": "John Doe",

lib/dune

@@ -0,0 +1,38 @@
+(ocamllex read)
+
+(rule
+ (targets yojson.ml)
+ (deps
+   (:out yojson.cppo.ml)
+   read.ml
+   write.ml
+   safe.ml
+   pretty.ml
+   write2.ml
+   common.ml
+   util.ml
+   type.ml)
+  (action (run cppo %{out} -o %{targets})))
+
+(rule
+ (targets yojson.mli)
+ (deps
+   (:out yojson.cppo.mli)
+   write.mli
+   read.mli
+   safe.mli
+   pretty.mli
+   write2.mli
+   common.mli
+   util.mli
+   type.ml)
+ (action (run cppo %{out} -o %{targets})))
+
+(library
+ (name yojson)
+ (public_name yojson)
+ (modules yojson yojson_biniou)
+ (wrapped false)
+ (synopsis "JSON parsing and printing (successor of json-wheel)")
+ (flags (-safe-string))
+ (libraries easy-format biniou))

yojson.opam

@@ -6,13 +6,13 @@ bug-reports: "https://github.com/ocaml-community/yojson/issues"
 dev-repo: "git+https://github.com/ocaml-community/yojson.git"
 doc: "https://ocaml-community.github.io/yojson/"
 build: [
-  ["jbuilder" "subst" "-n" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
 ]
-run-test: ["jbuilder" "runtest" "-p" name]
+run-test: ["dune" "runtest" "-p" name]
 depends: [
   "ocaml" {>= "4.02.3"}
-  "jbuilder" {build}
+  "dune" {build}
   "cppo" {build}
   "easy-format"
   "biniou" {>= "1.2.0"}