migrate from topkg-jbuilder to dune (#5)

Makefile

@@ -3,37 +3,35 @@ REPO = mrt-format
 
 .PHONY: build
 build:
-	jbuilder build --dev
+	dune build
 
 .PHONY: clean
 clean:
-	jbuilder clean
+	dune clean
 
 .PHONY: test
 test:
-	jbuilder runtest --dev
+	dune runtest
 
 .PHONY: install
 install:
-	jbuilder build @install
-	jbuilder install
+	dune build @install
+	dune install
 
 .PHONY: uninstall
 uninstall:
-	jbuilder uninstall
+	dune uninstall
 
 .PHONY: distrib
 distrib:
-	[ -x $$(opam config var root)/plugins/opam-publish/repos/$(REPO) ] || \
-	  opam-publish repo add $(REPO) $(ORG)/$(REPO)
-	topkg tag
-	topkg distrib
+	dune-release tag
+	dune-release distrib
 
 .PHONY: public
 publish:
-	topkg publish
-	topkg opam pkg
-	topkg opam submit
+	dune-release publish
+	dune-release opam pkg
+	dune-release opam submit
 
 .PHONY: release
 release: distrib publish

bin/dune

@@ -0,0 +1,5 @@
+(executables
+ (names omrt updates)
+ (public_names omrt updates)
+ (flags :standard -w A-27-32-4-39-8-44-3-6-40-42)
+ (libraries mrt-format))

dune-project

@@ -0,0 +1,2 @@
+(lang dune 1.0)
+(name mrt-format)

lib/dune

@@ -0,0 +1,8 @@
+(library
+ (name mrt)
+ (public_name mrt-format)
+ (synopsis "MRT parser library.")
+ (preprocess
+  (pps ppx_cstruct))
+ (flags :standard -w A-27-32-4-39-8-44-3-6)
+ (libraries cstruct ipaddr logs result))

mrt-format.opam

@@ -1,24 +1,30 @@
-opam-version: "1.2"
+opam-version: "2.0"
 maintainer: "Richard Mortier <[email protected]>"
 authors: [ "Richard Mortier" ]
 license: "ISC"
 
 homepage: "https://github.com/mor1/mrt-format"
-dev-repo: "https://github.com/mor1/mrt-format.git"
+dev-repo: "git+https://github.com/mor1/mrt-format.git"
 bug-reports: "https://github.com/mor1/mrt-format/issues"
 doc: "https://mor1.github.io/mrt-format/"
 
 build: [
-  [ "jbuilder" "subst" ] {pinned}
-  [ "jbuilder" "build" "-p" name "-j" jobs ]
+  [ "dune" "subst" ] {pinned}
+  [ "dune" "build" "-p" name "-j" jobs ]
+  [ "dune" "runtest" "-p" name "-j" jobs ] {with-test}
 ]
 
 depends: [
-  "alcotest"    {test}
+  "ocaml"
+  "dune" {>= "1.1.0" & build}
+  "alcotest"    {with-test}
   "cstruct"     {>= "1.0.1"}
   "ipaddr"      {>= "2.0.0"}
   "logs"
   "ocamlfind"   {build}
   "ppx_cstruct" {build}
   "result"
 ]
+
+synopsis: "MRT parsing library and CLI"
+description: "A basic implementation of the [Multi-Threaded Routing Toolkit](https://tools.ietf.org/html/rfc6396) format, following my implementation in the [Python Routeing Toolkit](https://github.com/mor1/pyrt) and documentation in the [RFC](https://tools.ietf.org/html/rfc6396) and the [PyRT README](https://github.com/mor1/pyrt/blob/master/README.mrtd). Provides (incomplete) parsing libraries and a simple CLI tool."