Merge pull request #21 from avsm/0.4.0

0.4.0: port to jbuilder also

.gitignore

@@ -1,8 +1,3 @@
 _build
-*~
-\.\#*
-\#*#
-*.native
-*.byte
+.merlin
 *.install
-_tests/

.travis.yml

@@ -0,0 +1,16 @@
+language: c
+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-vnetif"
+  matrix:
+  - DISTRO="debian-stable" OCAML_VERSION="4.03.0"
+  - DISTRO="debian-testing" OCAML_VERSION="4.04.1"
+  - DISTRO="debian-unstable" OCAML_VERSION="4.04.0"
+  - DISTRO="ubuntu-16.04" OCAML_VERSION="4.04.1"
+  - DISTRO="alpine-3.5" OCAML_VERSION="4.04.0"
+  - DISTRO="fedora-25" OCAML_VERSION="4.03.0"

CHANGES.md

@@ -1,19 +1,31 @@
-0.3.1 (unreleased)
----- 
-- Don't export `Delayed_backend` yet
+v0.4.0 2017-06-12
+-----------------
 
-0.3 (unreleased)
+- Add optional `size_limit` to `Vnetif.create` to make it easier to test
+  MTUs (e.g. in TCP/IP) (#16 @yomimono).
+- Port build to Jbuilder.
+- Add Travis CI tests.
+
+v0.3.1 2016-02-22
+-----------------
+
+- Don't export `Delayed_backend` yet as it is not ready for primetime use.
+
+v0.3
 ----
+
 - Use topkg
 - Use new mirage-time and mirage-clock modules
 - Adapt to MirageOS version 3 errors scheme
 
-0.2 10-09-2016
-----
+v0.2 2016-09-10
+---------------
+
 - New call `unregister_and_flush` lets a node wait for all its listener
   callbacks to return before unregistering from the backend (#4)
 - Support more than 254 connected nodes
 
-0.1 30-04-2015
-----
-- First release
+v0.1 2015-04-30
+---------------
+
+- Initial public release.

Makefile

@@ -1,5 +1,24 @@
+.PHONY: all clean
+
 all:
-	ocaml pkg/pkg.ml build
+	jbuilder build
 
 clean:
-	ocaml pkg/pkg.ml clean
+	rm -rf _build *.install
+
+test:
+	jbuilder runtest
+
+REPO=../../mirage/opam-repository
+PACKAGES=$(REPO)/packages
+# until we have https://github.com/ocaml/opam-publish/issues/38
+pkg-%:
+	topkg opam pkg -n $*
+	mkdir -p $(PACKAGES)/$*
+	cp -r _build/$*.* $(PACKAGES)/$*/
+	cd $(PACKAGES) && git add $*
+
+PKGS=$(basename $(wildcard *.opam))
+opam-pkg:
+	$(MAKE) $(PKGS:%=pkg-%)
+

README.md

@@ -1,5 +1,4 @@
-# mirage-vnetif
-Virtual network interface and software switch for Mirage. 
+# mirage-vnetif -- Virtual network interface and software switch for Mirage
 
 Provides the module `Vnetif` which can be used as a replacement for the regular `Netif` implementation in Xen and Unix. Stacks built using `Vnetif` are connected to a software switch that allows the stacks to communicate as if they were connected to the same LAN.
 

mirage-vnetif.opam

@@ -0,0 +1,30 @@
+opam-version: "1.2"
+name: "mirage-vnetif"
+maintainer: "Magnus Skjegstad <[email protected]>"
+authors: "Magnus Skjegstad <[email protected]>"
+homepage: "https://github.com/mirage/mirage-vnetif"
+bug-reports: "https://github.com/mirage/mirage-vnetif/issues/"
+dev-repo: "https://github.com/mirage/mirage-vnetif.git"
+doc: "https://docs.mirage.io/mirage-vnetif"
+license: "ISC"
+
+build: [
+  ["jbuilder" "subst"] {pinned}
+  ["jbuilder" "build" "-p" name "-j" jobs]
+]
+
+depends: [
+  "jbuilder"  {build & >="1.0+beta7"}
+  "lwt"
+  "mirage-time-lwt" {>= "1.0.0"}
+  "mirage-clock-lwt" {>= "1.2.0"}
+  "mirage-net-lwt" {>= "1.0.0"}
+  "cstruct" {>="2.4.0"}
+  "ipaddr"
+  "io-page"
+  "mirage-profile"
+  "duration"
+  "result"
+  "logs"
+]
+tags: ["org:mirage"]

pkg/pkg.ml

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

src/jbuild

@@ -0,0 +1,8 @@
+(jbuild_version 1)
+(library
+  ((name mirage_vnetif)
+   (public_name mirage-vnetif)
+   (modules (basic_backend vnetif))
+   (wrapped false)
+   (libraries (cstruct lwt mirage-clock-lwt ipaddr mirage-profile io-page duration result mirage-time-lwt mirage-net mirage-net-lwt logs))
+))