Ported the build from oasis to jbuilder.

Note that this commit includes code for coverage, but more work is required to
enable test running and coverage.

Signed-off-by: Konstantina Chremmou <[email protected]>

Author: Konstantina Chremmou

.coverage.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+set -ex
+
+COVERAGE_DIR=.coverage
+rm -rf $COVERAGE_DIR
+mkdir -p $COVERAGE_DIR
+pushd $COVERAGE_DIR
+if [ -z "$KEEP" ]; then trap "popd; rm -rf $COVERAGE_DIR" EXIT; fi
+
+$(which cp) -r ../* .
+
+opam pin add bisect_ppx 1.3.0 -y
+opam install ocveralls -y
+
+export BISECT_ENABLE=YES
+jbuilder runtest
+
+outs=$(find . | grep bisect.*.out)
+bisect-ppx-report -I $(dirname $outs[1]) -text report $outs
+bisect-ppx-report -I $(dirname $outs[1]) -summary-only -text summary $outs
+if [ -n "$HTML" ]; then bisect-ppx-report -I $(dirname $outs[1]) -html ../html-report $outs; fi
+
+if [ -n "$TRAVIS" ]; then
+  echo "\$TRAVIS set; running ocveralls and sending to coveralls.io..."
+  ocveralls --prefix _build/default $outs --send
+else
+  echo "\$TRAVIS not set; displaying results of bisect-report..."
+  cat report
+  cat summary
+fi

.gitignore

@@ -1,57 +1,13 @@
-lib/version.ml
-config.ml
-xenopsd-xenlight
-xenopsd-libvirt
-xenopsd-simulator
-xenopsd-qemu
-xenopsd-xc
-*.1
-.pc
-*~
-*\#*
+_build
+*.install
+.merlin
+
 *.orig
 *.rej
-*.a
-*.annot
-*.aux
-*.class
-*.cma
-*.cmi
-*.cmo
-*.cmx
-*.cmxa
-*.d
-*.dvi
-*.flc
-*.log
-*.o
-*.omc
-*.opic
-*.opt
-*.run
-*.pyc
-*.omakedb
-*.omakedb.lock
-*.db
-*.exe
-*.exe.mdb
-.*.swp
-*.dat
-*.gp
-*.spot
-*.spit
-*.cmt
-*.cmti
-*.so
-*.native
-config.mk
-dist
-_build
-setup.bin
-setup.data
-setup.ml
+
 scripts/vif
 scripts/xen-backend.rules
 scripts/xen-backend-xl.rules
-_oasis
-coverage/
+config.mk
+config.ml
+xentoollog_flags

.merlin

@@ -1,4 +1,3 @@
-
 # Coverage Analysis
 
 This project can be compiled for coverage analysis using [bisect_ppx]. By
@@ -7,7 +6,7 @@ default, this is not done. To compile for coverage analysis, do:
     ./configure --enable-coverage
     make
 
-This sets the `BISECT_COVERAGE` make and environment variable, which adds a dependency
+This sets the `BISECT_ENABLE` make and environment variable, which adds a dependency
 on `bisect_ppx` at `make setup.ml` time.
 This ensures that a proper dependency gets added to the META file, so that other
 projects can successfully link `xenopsd` even if they are themselves not built
@@ -44,8 +43,4 @@ top-level directory:
 
 This creates an HTML document in [coverage/](./coverage].
 
-[bisect_ppx]:	https://github.com/aantron/bisect_ppx
-
-
-
-
+[bisect_ppx]: https://github.com/aantron/bisect_ppx

COVERAGE.md

@@ -1,76 +1,36 @@
-.PHONY: all clean install build test libinstall reinstall uninstall distclean reindent
-all: build
+include config.mk
 
-NAME=xenopsd
-J=4
+OPAM_PREFIX=$(DESTDIR)$(shell opam config var prefix)
+OPAM_LIBDIR=$(DESTDIR)$(shell opam config var lib)
 
-ENABLE_TESTS=--enable-tests
-COVERAGE=coverage
+.PHONY: build clean release test reindent install uninstall
 
-clean:
-	@rm -f setup.data setup.log setup.bin setup.ml _oasis lib/version.ml
-	@rm -rf _build
-	@rm -f xenopsd-xc xenopsd-xenlight xenopsd-simulator xenopsd-libvirt
-	@rm -f xenopsd-xc.1 xenopsd-xenlight.1 xenopsd-simulator.1 xenopsd-libvirt.1
-	@rm -f *.native
-	@rm -f /tmp/bisect-xenops*.out || true
-	@rm -rf $(COVERAGE)
-
--include config.mk
-
-config.mk:
-	echo Please re-run configure
-	exit 1
+build:
+	jbuilder build @install
 
-setup.bin: setup.ml
-	@ocamlfind ocamlopt -o $@ -linkpkg -package oasis.dynrun setup.ml || ocamlfind ocamlc -o $@ -linkpkg -package oasis.dynrun setup.ml
-	@rm -f setup.cmi setup.cmo setup.cmx setup.o
-
-setup.data: setup.bin
-	@./setup.bin -configure $(ENABLE_TESTS) $(ENABLE_XEN) $(ENABLE_XENLIGHT) $(ENABLE_XENGUESTBIN) $(ENABLE_XENTOOLLOG)
-
-setup.ml: _oasis.in
-ifeq ($(BISECT_COVERAGE),YES)
-	rm -f _oasis
-	sed -e 's/BuildDepends:/BuildDepends: bisect_ppx,/' _oasis.in >_oasis
-else
-	ln -sf _oasis.in _oasis
-endif
-	oasis setup -setup-update dynamic
-
-_build/config.ml: config.ml
-	@mkdir -p _build
-	@cp config.ml _build/
-
-build: setup.data setup.bin version.ml _build/config.ml
-	@./setup.bin -build -j $(J)
-ifeq ($(ENABLE_XENLIGHT),--enable-xenlight)
-	ln -sf ./xenops_xl_main.native xenopsd-xenlight
-	./xenopsd-xenlight --help=groff > xenopsd-xenlight.1
-endif
-	ln -sf ./xenops_simulator_main.native xenopsd-simulator
-	./xenopsd-simulator --help=groff > xenopsd-simulator.1
-	ln -sf ./xenops_xc_main.native xenopsd-xc
-	./xenopsd-xc --help=groff > xenopsd-xc.1
+clean:
+	jbuilder clean
 
-test: build
-	@./setup.bin -test
+release:
+	jbuilder build @install
 
-version.ml: VERSION
-	echo "let version = \"$(shell cat VERSION)\"" > lib/version.ml
+test:
+	jbuilder runtest --no-buffer
 
-libinstall: build
-	@./setup.bin -install
+reindent:
+	git ls-files '*.ml*' '**/*.ml*' | xargs ocp-indent --syntax cstruct -i
 
-install: libinstall
+install:
+	jbuilder install --prefix=$(OPAM_PREFIX) --libdir=$(OPAM_LIBDIR) xapi-xenopsd
 ifeq ($(ENABLE_XENLIGHT),--enable-xenlight)
-	install -D ./xenops_xl_main.native $(DESTDIR)/$(SBINDIR)/xenopsd-xenlight
-	install -D ./xenopsd-xenlight.1 $(DESTDIR)/$(MANDIR)/man1/xenopsd-xenlight.1
+	install -D _build/install/default/bin/xenopsd-xenlight $(DESTDIR)/$(SBINDIR)/xenopsd-xenlight
+	install -D _build/install/default/man/man1/xenopsd-xenlight.1 $(DESTDIR)/$(MANDIR)/man1/xenopsd-xenlight.1
 endif
-	install -D ./xenops_simulator_main.native $(DESTDIR)/$(SBINDIR)/xenopsd-simulator
-	install -D ./xenopsd-simulator.1 $(DESTDIR)/$(MANDIR)/man1/xenopsd-simulator.1
-	install -D ./xenops_xc_main.native $(DESTDIR)/$(SBINDIR)/xenopsd-xc
-	install -D ./xenopsd-xc.1 $(DESTDIR)/$(MANDIR)/man1/xenopsd-xc.1
+	install -D _build/install/default/bin/xenopsd-simulator $(DESTDIR)/$(SBINDIR)/xenopsd-simulator
+	install -D _build/install/default/man/man1/xenopsd-simulator.1 $(DESTDIR)/$(MANDIR)/man1/xenopsd-simulator.1
+	install -D _build/install/default/bin/xenopsd-xc $(DESTDIR)/$(SBINDIR)/xenopsd-xc
+	install -D _build/install/default/man/man1/xenopsd-xc.1 $(DESTDIR)/$(MANDIR)/man1/xenopsd-xc.1
+	install -D _build/install/default/bin/set-domain-uuid $(DESTDIR)/$(LIBEXECDIR)/set-domain-uuid
 	install -D ./scripts/vif $(DESTDIR)/$(LIBEXECDIR)/vif
 	install -D ./scripts/vif-real $(DESTDIR)/$(LIBEXECDIR)/vif-real
 	install -D ./scripts/block $(DESTDIR)/$(LIBEXECDIR)/block
@@ -82,20 +42,17 @@ endif
 	install -D ./scripts/setup-pvs-proxy-rules $(DESTDIR)/$(LIBEXECDIR)/setup-pvs-proxy-rules
 	install -D ./scripts/common.py $(DESTDIR)/$(LIBEXECDIR)/common.py
 	install -D ./scripts/igmp_query_injector.py $(DESTDIR)/$(LIBEXECDIR)/igmp_query_injector.py
-	install -D ./set_domain_uuid.native $(DESTDIR)/$(LIBEXECDIR)/set-domain-uuid
 	DESTDIR=$(DESTDIR) SBINDIR=$(SBINDIR) LIBEXECDIR=$(LIBEXECDIR) ETCDIR=$(ETCDIR) ./scripts/make-custom-xenopsd.conf
 
-reinstall: install
-	@ocamlfind remove $(NAME) || true
-
 uninstall:
-	@ocamlfind remove $(NAME) || true
+	jbuilder uninstall --prefix=$(OPAM_PREFIX) --libdir=$(OPAM_LIBDIR) xapi-xenopsd
 	rm -f $(DESTDIR)/$(SBINDIR)/xenopsd-xenlight
 	rm -f $(DESTDIR)/$(SBINDIR)/xenopsd-xc
 	rm -f $(DESTDIR)/$(SBINDIR)/xenopsd-simulator
 	rm -f $(DESTDIR)/$(MANDIR)/man1/xenopsd-xenlight.1
 	rm -f $(DESTDIR)/$(MANDIR)/man1/xenopsd-xc.1
-	rm -f $(DESTDIR)/$(MANDIR)/man1/xenopsd-simluator.1
+	rm -f $(DESTDIR)/$(MANDIR)/man1/xenopsd-simulator.1
+	rm -f $(DESTDIR)/$(LIBEXECDIR)/set-domain-uuid
 	rm -f $(DESTDIR)/$(ETCDIR)/xenopsd.conf
 	rm -f $(DESTDIR)/$(LIBEXECDIR)/vif
 	rm -f $(DESTDIR)/$(LIBEXECDIR)/vif-real
@@ -108,20 +65,3 @@ uninstall:
 	rm -f $(DESTDIR)/$(LIBEXECDIR)/setup-pvs-proxy-rules
 	rm -f $(DESTDIR)/$(LIBEXECDIR)/common.py*
 	rm -f $(DESTDIR)/$(LIBEXECDIR)/igmp_query_injector.py*
-
-.PHONY: release
-release:
-	# remove -warn-error
-	grep -v 'warn-error' _oasis > _oasis.tmp
-	mv _oasis.tmp _oasis
-	oasis setup
-
-# make report   - create coverage/index.html 
-
-report:
-	bisect-ppx-report -I _build -html $(COVERAGE) /tmp/bisect-xenops*out
-
-.PHONY: report
-
-reindent:
-	git ls-files '*.ml' '*.mli' | xargs ocp-indent --syntax cstruct -i