Merge pull request #70 from rgrinberg/jbuilder

.gitignore

@@ -8,3 +8,5 @@ setup.data
 *.native
 *.byte
 *.docdir
+*.install
+.merlin

.travis.yml

@@ -1,9 +1,29 @@
 language: c
-sudo: required
-install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh
-script: bash -ex .travis-opam.sh
+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:
-  - OCAML_VERSION=4.03
-  - OCAML_VERSION=4.04
-os:
-  - linux
+  global:
+  - PINS="angstrom-async:. angstrom-lwt-unix:. angstrom-unix:. angstrom:."
+  matrix:
+  - PACKAGE="angstrom" DISTRO="ubuntu-16.04" OCAML_VERSION="4.04.2"
+  - PACKAGE="angstrom-async" DISTRO="ubuntu-16.04" OCAML_VERSION="4.04.2"
+  - PACKAGE="angstrom-lwt-unix" DISTRO="ubuntu-16.04" OCAML_VERSION="4.04.2"
+  - PACKAGE="angstrom-unix" DISTRO="ubuntu-16.04" OCAML_VERSION="4.04.2"
+  - PACKAGE="angstrom" DISTRO="alpine-3.5" OCAML_VERSION="4.03.0"
+  - PACKAGE="angstrom-async" DISTRO="alpine-3.5" OCAML_VERSION="4.03.0"
+  - PACKAGE="angstrom-lwt-unix" DISTRO="alpine-3.5" OCAML_VERSION="4.03.0"
+  - PACKAGE="angstrom-unix" DISTRO="alpine-3.5" OCAML_VERSION="4.03.0"
+  - PACKAGE="angstrom" DISTRO="debian-unstable" OCAML_VERSION="4.03.0"
+  - PACKAGE="angstrom-async" DISTRO="debian-unstable" OCAML_VERSION="4.03.0"
+  - PACKAGE="angstrom-lwt-unix" DISTRO="debian-unstable" OCAML_VERSION="4.03.0"
+  - PACKAGE="angstrom-unix" DISTRO="debian-unstable" OCAML_VERSION="4.03.0"
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/6ee5059c7420709f4ad1
+    on_success: change
+    on_failure: always
+    on_start: false

META.angstrom.template

@@ -0,0 +1,16 @@
+# JBUILDER_GEN
+
+package "unix" (
+  description = "Deprecated. Use angstrom-unix directly"
+  requires = "angstrom-unix"
+)
+
+package "lwt-unix" (
+  description = "Deprecated. Use angstrom-lwt-unix directly"
+  requires = "angstrom-lwt-unix"
+)
+
+package "async" (
+  description = "Deprecated. Use angstrom-async directly"
+  requires = "angstrom-async"
+)

Makefile

@@ -1,41 +1,19 @@
-# OASIS_START
-# DO NOT EDIT (digest: a3c674b4239234cbbe53afe090018954)
+.PHONY: all build clean test
 
-SETUP = ocaml setup.ml
+build:
+	jbuilder build @install
 
-build: setup.data
-	$(SETUP) -build $(BUILDFLAGS)
+all: build
 
-doc: setup.data build
-	$(SETUP) -doc $(DOCFLAGS)
+test:
+	jbuilder runtest
 
-test: setup.data build
-	$(SETUP) -test $(TESTFLAGS)
+install:
+	jbuilder install
 
-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)
-
-configure:
-	$(SETUP) -configure $(CONFIGUREFLAGS)
-
-.PHONY: build doc test all install uninstall reinstall clean distclean configure
+	rm -rf _build *.install
 
-# OASIS_STOP

angstrom-async.descr

@@ -0,0 +1 @@
+Angstrom - Async-specific support

angstrom-async.opam

@@ -0,0 +1,21 @@
+opam-version: "1.2"
+name: "angstrom-async"
+maintainer: "Spiros Eliopoulos <[email protected]>"
+authors: [ "Spiros Eliopoulos <[email protected]>" ]
+license: "BSD-3-clause"
+homepage: "https://github.com/inhabitedtype/angstrom"
+bug-reports: "https://github.com/inhabitedtype/angstrom/issues"
+dev-repo: "https://github.com/inhabitedtype/angstrom.git"
+build: [
+  ["jbuilder" "subst"] {pinned}
+  ["jbuilder" "build" "-p" name "-j" jobs]
+]
+build-test: [
+  ["jbuilder" "runtest" "-p" name]
+]
+depends: [
+  "jbuilder" {build & >= "1.0+beta10"}
+  "angstrom"
+  "async"
+]
+available: [ ocaml-version >= "4.03.0" ]

angstrom-lwt-unix.descr

@@ -0,0 +1 @@
+Angstrom - Lwt- and Unix-specific support

angstrom-lwt-unix.opam

@@ -0,0 +1,21 @@
+opam-version: "1.2"
+maintainer: "Spiros Eliopoulos <[email protected]>"
+authors: [ "Spiros Eliopoulos <[email protected]>" ]
+license: "BSD-3-clause"
+homepage: "https://github.com/inhabitedtype/angstrom"
+bug-reports: "https://github.com/inhabitedtype/angstrom/issues"
+dev-repo: "https://github.com/inhabitedtype/angstrom.git"
+build: [
+  ["jbuilder" "subst"] {pinned}
+  ["jbuilder" "build" "-p" name "-j" jobs]
+]
+build-test: [
+  ["jbuilder" "runtest" "-p" name]
+]
+depends: [
+  "jbuilder" {build & >= "1.0+beta10"}
+  "angstrom"
+  "lwt"
+  "base-unix"
+]
+available: [ ocaml-version >= "4.03.0" ]

angstrom-unix.descr

@@ -0,0 +1 @@
+Angstrom - Unix-specific support

angstrom-unix.opam

@@ -0,0 +1,20 @@
+opam-version: "1.2"
+maintainer: "Spiros Eliopoulos <[email protected]>"
+authors: [ "Spiros Eliopoulos <[email protected]>" ]
+license: "BSD-3-clause"
+homepage: "https://github.com/inhabitedtype/angstrom"
+bug-reports: "https://github.com/inhabitedtype/angstrom/issues"
+dev-repo: "https://github.com/inhabitedtype/angstrom.git"
+build: [
+  ["jbuilder" "subst"] {pinned}
+  ["jbuilder" "build" "-p" name "-j" jobs]
+]
+build-test: [
+  ["jbuilder" "runtest" "-p" name]
+]
+depends: [
+  "jbuilder" {build & >= "1.0+beta10"}
+  "angstrom"
+  "base-unix"
+]
+available: [ ocaml-version >= "4.03.0" ]