Merge pull request #314 from djs55/support-system-compiler

Update to OCaml 4.06.0

Author: djs55

appveyor.yml

@@ -9,7 +9,7 @@ environment:
   CYG_ARCH: "x86_64"
   CYGWIN: "winsymlinks:native"
   CUSTOM_OPAM: "1"
-  OPAM_COMP: "4.03.0+mingw64c"
+  OPAM_COMP: "4.06.0+mingw64c"
 
 install:
   - cmd: git config core.symlinks true

circle.yml

@@ -7,7 +7,7 @@ machine:
     MACOSX_DEPLOYMENT_TARGET: "10.10"
     CUSTOM_OPAM: "1"
     OPAM_REPO: repo/darwin
-    OPAM_COMP: "4.03.0"
+    OPAM_COMP: "4.06.0"
 general:
   artifacts:
   - vpnkit.tgz

repo/Makefile

@@ -10,7 +10,7 @@ update-osx:
 	./update-upstream.sh $(PKGS)
 
 update-win:
-	OPAM_OS="win32" OPAM_SWITCH="4.03.0+mingw64c" \
+	OPAM_OS="win32" OPAM_SWITCH="4.06.0+mingw64c" \
 	OPAM_REPO="https://github.com/fdopen/opam-repository-mingw.git" \
 	./update-upstream.sh $(PKGS) depext-cygwinports
 

repo/darwin/compilers/4.06.0.comp

@@ -0,0 +1,22 @@
+opam-version: "1"
+version: "4.06.0"
+src: "https://github.com/ocaml/ocaml/archive/4.06.0.tar.gz"
+build: [
+  ["./configure"
+    "-prefix" prefix "-with-debug-runtime"
+  ] { os != "openbsd" & os  != "freebsd" & os  != "darwin" }
+  ["./configure"
+    "-prefix" prefix "-with-debug-runtime"
+    "-cc" "cc"
+    "-aspp" "cc -c"
+  ] { os  = "openbsd" | os  = "freebsd" | os  = "darwin" }
+  [make "world"]
+  [make "world.opt"]
+  [make "install"]
+]
+packages: [
+  "base-unix"
+  "base-bigarray"
+  "base-threads"
+]
+env: [[CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"]]

repo/darwin/compilers/4.06.0.descr

@@ -0,0 +1 @@
+Official 4.06.0 release

repo/darwin/packages/upstream/alcotest.0.7.2/descr

@@ -0,0 +1,61 @@
+Logo](https://raw.githubusercontent.com/mirage/alcotest/master/alcotest-logo.png)
+
+Alcotest is a lightweight and colourful test framework.
+
+Alcotest exposes simple interface to perform unit tests. It exposes
+a simple `TESTABLE` module type, a `check` function to assert test
+predicates and a `run` function to perform a list of `unit -> unit`
+test callbacks.
+
+Alcotest provides a quiet and colorful output where only faulty runs
+are fully displayed at the end of the run (with the full logs ready to
+inspect), with a simple (yet expressive) query language to select the
+tests to run.
+
+[![Build Status](https://travis-ci.org/mirage/alcotest.svg)](https://travis-ci.org/mirage/alcotest)
+[![docs](https://img.shields.io/badge/doc-online-blue.svg)](https://mirage.github.io/alcotest/alcotest/index.html)
+
+### Examples
+
+A simple example:
+
+```ocaml
+(* Build with `ocamlbuild -pkg alcotest simple.byte` *)
+
+(* A module with functions to test *)
+module To_test = struct
+  let capit letter = Char.uppercase letter
+  let plus int_list = List.fold_left (fun a b -> a + b) 0 int_list
+end
+
+(* The tests *)
+let capit () =
+  Alcotest.(check char) "same chars"  'A' (To_test.capit 'a')
+
+let plus () =
+  Alcotest.(check int) "same ints" 7 (To_test.plus [1;1;2;3])
+
+let test_set = [
+  "Capitalize" , `Quick, capit;
+  "Add entries", `Slow , plus ;
+]
+
+(* Run it *)
+let () =
+  Alcotest.run "My first test" [
+    "test_set", test_set;
+  ]
+```
+
+The result is a self-contained binary which displays the test results. Use
+`./simple.byte --help` to see the runtime options.
+
+```shell
+$ ./simple.native
+[OK]        test_set  0   Capitalize.
+[OK]        test_set  1   Add entries.
+Test Successful in 0.001s. 2 tests run.
+```
+
+See the [examples](https://github.com/mirage/alcotest/tree/master/examples)
+folder for more examples.

repo/darwin/packages/upstream/alcotest.0.7.2/url

@@ -7,18 +7,17 @@ bug-reports: "https://github.com/mirage/alcotest/issues/"
 license:     "ISC"
 doc:         "https://mirage.github.io/alcotest/"
 
-build: ["ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%"]
-build-test: [
-  ["ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" "--tests" "true"]
-  ["ocaml" "pkg/pkg.ml" "test" ]
+build: [
+  ["jbuilder" "subst" "-n" name] {pinned}
+  ["jbuilder" "build" "-p" name "-j" jobs]
 ]
+build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
+
 depends: [
-  "ocamlfind"  {build}
-  "ocamlbuild" {build}
-  "topkg"      {build}
-  "fmt"
+  "jbuilder"  {build & >= "1.0+beta10"}
+  "fmt"       {>= "0.8.0"}
   "astring"
   "result"
   "cmdliner"
 ]
-available: [ocaml-version >= "4.01.0"]
+available: [ocaml-version >= "4.02.3"]

repo/darwin/packages/upstream/alcotest.0.8.1/descr

@@ -0,0 +1,2 @@
+archive: "https://github.com/mirage/alcotest/releases/download/0.8.1/alcotest-0.8.1.tbz"
+checksum: "8b8d9f8c9e8c0b34c12e20e24db8dec3"