Merge pull request #42 from djs55/jbuilder

Modernise build and CI

Author: djs55

.travis.yml

@@ -1,10 +1,13 @@
 language: c
-install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-opam.sh
-sudo: required
-script: sudo bash -ex .travis-opam.sh # sudo because we're going to use tuntap
+sudo: false
+services:
+  - docker
+install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-docker.sh
+script: bash -ex ./.travis-docker.sh
 env:
   global:
-  - PACKAGE=mirage-net-unix EXTRA_REMOTES="git://github.com/mirage/mirage-dev.git"
+  - EXTRA_REMOTES="https://github.com/djs55/opam-repository.git#io-page"
+  - PACKAGE="mirage-net-unix"
   matrix:
-  - OCAML_VERSION=4.02
-  - OCAML_VERSION=4.03
+  - DISTRO="debian-testing" OCAML_VERSION="4.03.0"
+  - DISTRO="alpine-3.4" OCAML_VERSION="4.04.0"

CHANGES.md

@@ -1,3 +1,8 @@
+### 2.4.1 (16-Jun-2017)
+
+* Build with jbuilder
+* Update to use io-page-unix
+
 ### 2.4.0 (02-Apr-2017)
 
 * Expose the underlying fd (#40, from @samoht)

Makefile

@@ -1,6 +1,17 @@
-all:
-	ocaml pkg/pkg.ml build --tests true
-	ocaml pkg/pkg.ml test
+
+.PHONY: build clean test
+
+build:
+	jbuilder build @install --dev
+
+test:
+	jbuilder runtest --dev
+
+install:
+	jbuilder install
+
+uninstall:
+	jbuilder uninstall
 
 clean:
-	ocaml pkg/pkg.ml clean
+	rm -rf _build

_tags

@@ -12,19 +12,18 @@ dev-repo:    "https://github.com/mirage/mirage-net-unix.git"
 license:     "ISC"
 doc:         "https://mirage.github.io/mirage-net-unix/"
 
-build:   [ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" "--tests" "false" ]
-build-test: [
-  [ "ocaml" "pkg/pkg.ml" "build" "--tests" "true" ]
-  [ "ocaml" "pkg/pkg.ml" "test" ]
+build: [
+  [ "jbuilder" "subst"] {pinned}
+  [ "jbuilder" "build" "-p" name "-j" jobs ]
 ]
+
 depends: [
+  "jbuilder"  {build & >="1.0+beta9"}
   "cstruct" {>= "1.7.1"}
-  "ocamlfind" {build}
-  "ocamlbuild" {build}
-  "topkg" {build}
+  "cstruct-lwt"
   "lwt" {>= "2.4.3"}
   "mirage-net-lwt" {>= "1.0.0"}
-  "io-page" {>= "1.0.1"}
+  "io-page-unix" {>= "2.0.0"}
   "tuntap" {>= "1.3.0"}
   "result"
   "alcotest" {test}

opam renamed to mirage-net-unix.opam

@@ -1,10 +1,3 @@
 #!/usr/bin/env ocaml
 #use "topfind"
-#require "topkg"
-open Topkg
-
-let () =
-  Pkg.describe "mirage-net-unix" @@ fun c ->
-  Ok [ Pkg.mllib "src/mirage-net-unix.mllib";
-       Pkg.test "test/test"
-  ]
+#require "topkg-jbuilder.auto"

pkg/pkg.ml

@@ -0,0 +1,6 @@
+(library
+ ((name mirage_net_unix)
+  (public_name mirage-net-unix)
+  (libraries (io-page-unix cstruct cstruct-lwt lwt.unix mirage-net-lwt tuntap result))
+  (wrapped false)
+))

src/jbuild

@@ -0,0 +1,9 @@
+(executables
+ ((names (test))
+  (libraries (alcotest mirage-net-unix))
+))
+
+(alias
+ ((name    runtest)
+  (deps    (test.exe))
+  (action  (run ${<} ))))