transition to jbuilder (#571)

* benchmark and ppx-test executables are now built as port of testing
* more robust ppx extension, should be future proof
* update opam file
* simplify .travis.yml -> no more external dependencies
* new Makefile
* remove various obsolete files, including oasis and META files

.gitignore

@@ -21,6 +21,8 @@ setup.log
 *.svg
 *.mldylib
 *.mllib
+.merlin
+*.install
 
 # auto generated files
 lib/Frenetic_NetKAT_Tokens*

.travis.yml

@@ -1,25 +1,13 @@
 language: c
-sudo: required
-install: 
-  - wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh
-  - wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-docgen.sh
-script: 
-  - bash -ex .travis-opam.sh
-  - bash -ex .travis-docgen.sh
 env:
-  matrix:
-  - OCAML_VERSION=4.04 PACKAGE=frenetic TESTS=true BASE_REMOTE=https://opam.ocaml.org KEEP=1 FORK_USER=frenetic-lang PRE_INSTALL_HOOK="oasis setup"
-  global:
-    secure: Knubza2foy3fm4iKfXTE+DBxQE0XjeT8PN4O1aXZpLqZAGuCt3UU1gOs03lUzbqjU6IOzV8H2y4ctQ7eHiTK9G/kQawSZZtOb15oDOGa8zBM/1tA06GjrBIJhqOk3R6ro0V8eU3W3BqqrbR0cZhGaASFJ2tTDiX53G9dEFJWqho=
-notifications:
-  irc:
-    channels:
-    - irc.freenode.net#frenetic
-    template:
-    - ! '%{repository}#%{build_number} (%{branch} - %{commit}): %{message}'
-    - ! 'Build details : %{build_url}'
-    on_success: change
-    on_failure: always
-branches:
-  only:
-    - master
+  - OCAML=4.04.2
+  - OCAML=4.05.0
+script:
+  - echo "yes" | sudo add-apt-repository ppa:avsm/ppa
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq opam
+  - opam init --auto-setup --compiler=$OCAML
+  - eval `opam config env`
+  - opam pin add --no-action frenetic .
+  - opam install --yes --deps-only frenetic
+  - opam install --yes --verbose --build-doc --build-test frenetic

Makefile

@@ -1,39 +1,23 @@
-all: build
+INSTALL_ARGS := $(if $(PREFIX),--prefix $(PREFIX),)
 
-J=4
+build:
+	time -p jbuilder build @install
 
-# SJS: Suppress duplicate topdirs.cmi warnings.
-OCAMLFIND_IGNORE_DUPS_IN = $(shell ocamlfind query compiler-libs)
-export OCAMLFIND_IGNORE_DUPS_IN
+install:
+	jbuilder install $(INSTALL_ARGS)
 
-setup.ml: _oasis
-	oasis setup
+uninstall:
+	jbuilder uninstall $(INSTALL_ARGS)
 
-setup.data: setup.ml
-	./configure
-
-build: setup.data setup.ml
-	ocaml setup.ml -build -j $(J)
-
-install: setup.data setup.ml
-	ocaml setup.ml -install
-
-reinstall: setup.ml
-	ocaml setup.ml -reinstall
-
-uninstall: setup.ml
-	ocaml setup.ml -uninstall
-
-test: setup.ml build
-	ocaml setup.ml -test $(TESTFLAGS)
+reinstall: uninstall reinstall
 
 clean:
-	ocamlbuild -clean
-	rm -f setup.data setup.log
-
-distclean:
-	ocaml setup.ml -distclean
-	rm -f setup.data setup.log
+	jbuilder clean
 
 doc:
-	ocaml setup.ml -doc
+	jbuilder build @doc
+
+test:
+	jbuilder build @runtest
+
+.PHONY: build install uninstall reinstall clean doc