Merge pull request #6 from avsm/jbuilder

port to jbuilder

.gitignore

@@ -1,8 +1,2 @@
 _build
-tmp
-*~
-\.\#*
-\#*#
 *.install
-*.native
-*.byte

CHANGES.md

@@ -1,3 +1,9 @@
-### 1.0.0 (2016-12-27)
+v1.1.0 2017-05-26
+-----------------
 
-First release, import V1.KV_RO and V1_LWT.KV_RO from mirage-types
+* Port to Jbuilder.
+
+v1.0.0 2016-12-27
+----------------
+
+First release, import `V1.KV_RO` and `V1_LWT.KV_RO` from mirage-types.

Makefile

@@ -1,7 +1,17 @@
-all:
-	ocaml pkg/pkg.ml build -n mirage-kv -q
-	ocaml pkg/pkg.ml build -n mirage-kv-lwt -q
+
+.PHONY: build clean test
+
+build:
+	jbuilder build @install
+
+test:
+	jbuilder runtest
+
+install:
+	jbuilder install
+
+uninstall:
+	jbuilder uninstall
 
 clean:
-	ocaml pkg/pkg.ml clean -n mirage-kv -q
-	ocaml pkg/pkg.ml clean -n mirage-kv-lwt -q
+	rm -rf _build

VERSION

@@ -0,0 +1 @@
+%%VERSION_NUM%%

lwt/.merlin

@@ -0,0 +1,17 @@
+B ../../_build/default/mirage-device/src
+B ../../_build/default/mirage-kv/lwt
+B ../../_build/default/mirage-kv/src
+FLG -w -40
+PKG bigarray
+PKG bytes
+PKG cstruct
+PKG fmt
+PKG lwt
+PKG ocplib-endian
+PKG ocplib-endian.bigstring
+PKG result
+PKG sexplib
+PKG sexplib.0
+PKG uchar
+PKG unix
+S .

lwt/jbuild

@@ -0,0 +1,5 @@
+(library
+ ((name        mirage_kv_lwt)
+  (public_name mirage-kv-lwt)
+  (libraries   (mirage-kv lwt cstruct))
+))

mirage-kv-lwt.opam

@@ -8,12 +8,13 @@ dev-repo:     "https://github.com/mirage/mirage-kv.git"
 bug-reports:  "https://github.com/mirage/mirage-kv/issues"
 tags:         ["org:mirage"]
 
-build: ["ocaml" "pkg/pkg.ml" "build" "-n" name "--pinned" "%{pinned}%" ]
+build: [
+  ["jbuilder" "subst"] {pinned}
+  ["jbuilder" "build" "-p" name "-j" jobs]
+]
 
 depends: [
-  "ocamlfind" {build}
-  "ocamlbuild" {build}
-  "topkg" {build & >= "0.8.0"}
+  "jbuilder" {build & >="1.0+beta7"}
   "mirage-kv" {>= "1.0.0"}
   "lwt"
   "cstruct" {>= "1.9.0"}

opam → mirage-kv.opam

@@ -8,12 +8,13 @@ dev-repo:     "https://github.com/mirage/mirage-kv.git"
 bug-reports:  "https://github.com/mirage/mirage-kv/issues"
 tags:         ["org:mirage"]
 
-build: ["ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" ]
+build: [
+  ["jbuilder" "subst"] {pinned}
+  ["jbuilder" "build" "-p" name "-j" jobs]
+]
 
 depends: [
-  "ocamlfind" {build}
-  "ocamlbuild" {build}
-  "topkg" {build & >= "0.8.0"}
+  "jbuilder" {build & >="1.0+beta7"}
   "mirage-device" {>= "1.0.0"}
   "fmt"
 ]

pkg/pkg.ml

@@ -1,30 +1,2 @@
-#!/usr/bin/env ocaml
 #use "topfind"
-#require "topkg"
-open Topkg
-
-let metas = [
-  Pkg.meta_file ~install:false "pkg/META";
-  Pkg.meta_file ~install:false "pkg/META.lwt";
-]
-
-let opams =
-  let opam no_lint name =
-    Pkg.opam_file ~lint_deps_excluding:(Some no_lint) ~install:false name
-  in
-  [
-  opam ["lwt"; "mirage-kv"; "cstruct"; "result"] "opam";
-  opam ["fmt"; "mirage-device"; "result"] "mirage-kv-lwt.opam";
-  ]
-
-let () =
-  Pkg.describe ~opams ~metas "mirage-kv" @@ fun c ->
-  match Conf.pkg_name c with
-  | "mirage-kv" ->
-    Ok [ Pkg.lib "pkg/META";
-         Pkg.mllib "src/mirage-kv.mllib" ]
-  | "mirage-kv-lwt" ->
-    Ok [ Pkg.lib "pkg/META.lwt" ~dst:"META";
-         Pkg.lib ~exts:Exts.interface "src/mirage_kv_lwt" ]
-  | other ->
-    R.error_msgf "unknown package name: %s" other
+#require "topkg-jbuilder.auto"

src/.merlin

@@ -0,0 +1,7 @@
+B ../../_build/default/mirage-device/src
+B ../../_build/default/mirage-kv/src
+FLG -w -40
+PKG fmt
+PKG result
+PKG uchar
+S .

src/jbuild

@@ -0,0 +1,5 @@
+(library
+ ((name        mirage_kv)
+  (public_name mirage-kv)
+  (libraries   (fmt mirage-device))
+))