Merge pull request xapi-project#11 from kc284/master

CP-26405: Ported build from oasis to jbuilder.

Author: Konstantina Chremmou

.gitignore

@@ -0,0 +1,6 @@
+_build
+.merlin
+*.install
+
+*.rej
+*.orig

.travis.yml

@@ -1,26 +1,20 @@
 language: c
-sudo: required
-dist: trusty
-before_install:
-    - sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ trusty main universe"
-    - sudo apt-get update -qq
-    - sudo apt-get install libgcrypt20 liblzma5 libselinux1
-    - wget "http://archive.ubuntu.com/ubuntu/ubuntu/pool/main/s/systemd/libsystemd0_219-7ubuntu3_amd64.deb"
-    - wget "http://archive.ubuntu.com/ubuntu/ubuntu/pool/main/s/systemd/libsystemd-dev_219-7ubuntu3_amd64.deb"
-    - sudo dpkg -i libsystemd0_219-7ubuntu3_amd64.deb libsystemd-dev_219-7ubuntu3_amd64.deb
-    - git clone https://github.com/xapi-project/xs-opam && cd xs-opam && sh into_repo.sh && cd -
 install:
-  - wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-opam.sh
+  - wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-docker.sh
 script:
-    - bash -ex .travis-opam.sh
+  - bash -ex .travis-docker.sh
+sudo: required
+services:
+  - docker
 env:
   global:
-    - OCAML_VERSION=4.02
+    - OCAML_VERSION=4.04.2
     - PACKAGE=xapi-tapctl
+    - DISTRO="debian-stable"
   matrix:
-    - BASE_REMOTE=$TRAVIS_BUILD_DIR/xs-opam
-    - EXTRA_REMOTES=$TRAVIS_BUILD_DIR/xs-opam
+      - BASE_REMOTE=git://github.com/xapi-project/xs-opam
+      - EXTRA_REMOTES=git://github.com/xapi-project/xs-opam
 matrix:
-  fast_finish: true
-  allow_failures:
-    - env: EXTRA_REMOTES=$TRAVIS_BUILD_DIR/xs-opam
+    fast_finish: true
+    allow_failures:
+      - env: EXTRA_REMOTES=git://github.com/xapi-project/xs-opam

INSTALL

@@ -8,5 +8,5 @@ include a Signed-off-by: line.
 Maintainers list
 ----------------
 
-* Jonathan Ludlam <jonathan.ludlam@eu.citrix.com> 
+* Jonathan Ludlam <jonathan.ludlam@citrix.com>
 

MAINTAINERS

@@ -1,45 +1,32 @@
-# OASIS_START
-# DO NOT EDIT (digest: a3c674b4239234cbbe53afe090018954)
+OPAM_PREFIX?=$(DESTDIR)$(shell opam config var prefix)
+OPAM_LIBDIR?=$(DESTDIR)$(shell opam config var lib)
 
-SETUP = ocaml setup.ml
+.PHONY: release build install uninstall clean test doc reindent
 
-build: setup.data
-	$(SETUP) -build $(BUILDFLAGS)
+release:
+	jbuilder build @install
 
-doc: setup.data build
-	$(SETUP) -doc $(DOCFLAGS)
+build:
+	jbuilder build @install --dev
 
-test: setup.data build
-	$(SETUP) -test $(TESTFLAGS)
+install:
+	jbuilder install --prefix=$(OPAM_PREFIX) --libdir=$(OPAM_LIBDIR) xapi-tapctl
 
-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 --prefix=$(OPAM_PREFIX) --libdir=$(OPAM_LIBDIR) xapi-tapctl
 
 clean:
-	$(SETUP) -clean $(CLEANFLAGS)
+	jbuilder clean
 
-distclean:
-	$(SETUP) -distclean $(DISTCLEANFLAGS)
+test:
+	jbuilder runtest
 
-setup.data:
-	$(SETUP) -configure $(CONFIGUREFLAGS)
+# requires odoc
+doc:
+	jbuilder build @doc
 
-configure:
-	$(SETUP) -configure $(CONFIGUREFLAGS)
+reindent:
+	git ls-files '*.ml*' | xargs ocp-indent --syntax cstruct -i
 
-.PHONY: build doc test all install uninstall reinstall clean distclean configure
 
-# OASIS_STOP
-#
-reinstall:
-	ocamlfind remove tapctl
-	$(SETUP) -install $(INSTALLFLAGS)
+.DEFAULT_GOAL := release

Makefile

@@ -1,6 +1,6 @@
-Before 1.0:
+Before 1.0
 ==========
 
-  * remove dependency on forkexec
-  * remove dependency on stdext
-  * improve ocamldoc
+* remove dependency on forkexec
+* remove dependency on stdext
+* improve ocamldoc

TODO.md

@@ -0,0 +1 @@
+(jbuild_version 1)