Merge pull request #3 from mseri/master

Port to jbuilder and resync with djs55 repo

Author: gaborigloi

.gitignore

@@ -1,8 +1,4 @@
-setup.bin
-setup.data
-setup.log
-dist
-_build
-api.docdir
-*.native
-*.byte
+_build/
+.merlin
+*.install
+

.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="fd-send-recv"
+  matrix:
+  - DISTRO="debian-testing" OCAML_VERSION="4.02.3"
+  - DISTRO="ubuntu-14.04" OCAML_VERSION="4.02.3"
+  - DISTRO="ubuntu-15.10" OCAML_VERSION="4.02.3"
+  - DISTRO="centos-7" OCAML_VERSION="4.02.3"
+  - DISTRO="centos-6" OCAML_VERSION="4.02.3"
+  - DISTRO="fedora-23" OCAML_VERSION="4.02.3"

CHANGES

@@ -1,3 +1,8 @@
+1.0.4 (2017-01-11)
+* add opam file
+* add .travis.yml
+* fix build on Win32
+
 1.0.1 (23-Apr-2013)
 * fix the build on Mac OSX
 

Makefile

@@ -1,41 +1,24 @@
-# OASIS_START
-# DO NOT EDIT (digest: a3c674b4239234cbbe53afe090018954)
+.PHONY: build release install uninstall clean test doc
 
-SETUP = ocaml setup.ml
+build:
+	jbuilder build @install --dev
 
-build: setup.data
-	$(SETUP) -build $(BUILDFLAGS)
+release:
+	jbuilder build @install
 
-doc: setup.data build
-	$(SETUP) -doc $(DOCFLAGS)
+install:
+	jbuilder install
 
-test: setup.data build
-	$(SETUP) -test $(TESTFLAGS)
-
-all:
-	$(SETUP) -all $(ALLFLAGS)
-
-install: setup.data
-	$(SETUP) -install $(INSTALLFLAGS)
-
-uninstall: setup.data
-	$(SETUP) -uninstall $(UNINSTALLFLAGS)
-
-reinstall: setup.data
-	$(SETUP) -reinstall $(REINSTALLFLAGS)
+uninstall:
+	jbuilder uninstall
 
 clean:
-	$(SETUP) -clean $(CLEANFLAGS)
-
-distclean:
-	$(SETUP) -distclean $(DISTCLEANFLAGS)
-
-setup.data:
-	$(SETUP) -configure $(CONFIGUREFLAGS)
+	jbuilder clean
 
-configure:
-	$(SETUP) -configure $(CONFIGUREFLAGS)
+test:
+	jbuilder runtest
 
-.PHONY: build doc test all install uninstall reinstall clean distclean configure
+# requires odoc
+doc:
+	jbuilder build @doc
 
-# OASIS_STOP

_oasis

@@ -14,10 +14,11 @@ tags: [
   "org:mirage"
   "org:xapi-project"
 ]
-build: make
-remove: [["ocamlfind" "remove" "fd-send-recv"]]
+build-test: [
+    ["jbuilder" "build" "-j" jobs]
+]
 depends: [
-  "ocamlfind"
-  "ocamlbuild" {build}
+  "jbuilder" {build}
+  "fd-send-recv"
+  "tuntap"
 ]
-install: [make "install"]

_tags

@@ -0,0 +1,21 @@
+opam-version: "1.2"
+maintainer: "[email protected]"
+authors: [
+  "David Scott"
+  "David Sheets"
+  "Euan Harris"
+  "Vincent Bernardoff"
+]
+homepage:     "https://github.com/xapi-project/ocaml-fd-send-recv"
+bug-reports:  "https://github.com/xapi-project/ocaml-fd-send-recv/issues"
+dev-repo:     "https://github.com/xapi-project/ocaml-fd-send-recv.git"
+doc:          "https://github.com/xapi-project/ocaml-fd-send-recv/blob/master/lib/fd_send_recv.mli"
+tags: [
+  "org:mirage"
+  "org:xapi-project"
+]
+build: [["jbuilder" "build" "-p" name "-j" jobs]]
+build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
+depends: [
+  "jbuilder" {build}
+]