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

Update to OCaml 4.06.0

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.8.1/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/win32/packages/upstream/alcotest.0.7.2/opam → repo/darwin/packages/upstream/alcotest.0.8.1/opam

@@ -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/url

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

repo/win32/packages/upstream/base.v0.9.3/descr → repo/darwin/packages/upstream/base.v0.10.0/descr

@@ -1,5 +1,7 @@
 Full standard library replacement for OCaml
 
+Full standard library replacement for OCaml
+
 Base is a complete and portable alternative to the OCaml standard
 library. It provides all standard functionalities one would expect
 from a language standard library. It uses consistent conventions

repo/darwin/packages/upstream/base.v0.10.0/opam

@@ -0,0 +1,18 @@
+opam-version: "1.2"
+maintainer: "[email protected]"
+authors: ["Jane Street Group, LLC <[email protected]>"]
+homepage: "https://github.com/janestreet/base"
+bug-reports: "https://github.com/janestreet/base/issues"
+dev-repo: "git+https://github.com/janestreet/base.git"
+license: "Apache-2.0"
+build: [
+  ["jbuilder" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "jbuilder"          {build & >= "1.0+beta12"}
+  "sexplib"           {>= "v0.10" & < "v0.11"}
+]
+depopts: [
+  "base-native-int63"
+]
+available: [ ocaml-version >= "4.04.1" ]

repo/darwin/packages/upstream/base.v0.10.0/url

@@ -0,0 +1,2 @@
+archive: "https://ocaml.janestreet.com/ocaml-core/v0.10/files/base-v0.10.0.tar.gz"
+checksum: "60a9db475c689720cc7fc4304e00b00e"

repo/win32/packages/upstream/bos.0.1.6/opam → repo/darwin/packages/upstream/bos.0.2.0/opam

@@ -12,12 +12,11 @@ depends: [
   "ocamlfind" {build}
   "ocamlbuild" {build}
   "topkg" {build & >= "0.9.0"}
-  "conf-which"
   "base-unix"
   "rresult" {>= "0.4.0"}
   "astring"
   "fpath"
-  "fmt"
+  "fmt" {>= "0.8.0"}
   "logs"
   "mtime" {test}
 ]

repo/darwin/packages/upstream/bos.0.2.0/url

@@ -0,0 +1,2 @@
+archive: "http://erratique.ch/software/bos/releases/bos-0.2.0.tbz"
+checksum: "aeae7447567db459c856ee41b5a66fd2"

repo/darwin/packages/upstream/cohttp.0.99.0/descr → repo/darwin/packages/upstream/cohttp-lwt.1.0.0/descr

@@ -12,8 +12,7 @@ libraries:
   library.
 * `Cohttp_lwt` exposes an OS-independent Lwt interface, which is used
   by the [Mirage](http://www.openmirage.org) interface
-  to generate standalone microkernels (see the [mirage-http](https://github.com/mirage/mirage-http)
-  repository).
+  to generate standalone microkernels use the cohttp-mirage subpackage.
 * `Cohttp_lwt_xhr` compiles to a JavaScript module that maps the Cohttp
    calls to XMLHTTPRequests.  This is used to compile OCaml libraries like
    the GitHub bindings to JavaScript and still run efficiently.

repo/darwin/packages/upstream/cohttp-lwt.0.99.0/opam → repo/darwin/packages/upstream/cohttp-lwt.1.0.0/opam

@@ -21,11 +21,8 @@ build: [
 build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
 depends: [
   "jbuilder" {build & >= "1.0+beta10"}
-  "conduit" {>= "0.14.0"}
-  "cohttp" {>="0.99.0"}
-  "lwt"
-]
-conflicts: [
-  "lwt" {< "2.5.0"}
+  "ppx_sexp_conv" {build}
+  "cohttp" {>="1.0.0"}
+  "lwt" {>="2.5.0"}
 ]
 available: [ocaml-version >= "4.03.0"]

repo/darwin/packages/upstream/cohttp-lwt.1.0.0/url

@@ -0,0 +1,2 @@
+archive: "https://github.com/mirage/ocaml-cohttp/releases/download/v1.0.0/cohttp-1.0.0.tbz"
+checksum: "756f590576d4a60ce2382ef89274b44b"

repo/win32/packages/upstream/cohttp-lwt.0.99.0/descr → repo/darwin/packages/upstream/cohttp.1.0.0/descr

@@ -12,8 +12,7 @@ libraries:
   library.
 * `Cohttp_lwt` exposes an OS-independent Lwt interface, which is used
   by the [Mirage](http://www.openmirage.org) interface
-  to generate standalone microkernels (see the [mirage-http](https://github.com/mirage/mirage-http)
-  repository).
+  to generate standalone microkernels use the cohttp-mirage subpackage.
 * `Cohttp_lwt_xhr` compiles to a JavaScript module that maps the Cohttp
    calls to XMLHTTPRequests.  This is used to compile OCaml libraries like
    the GitHub bindings to JavaScript and still run efficiently.

repo/darwin/packages/upstream/cohttp.0.99.0/opam → repo/darwin/packages/upstream/cohttp.1.0.0/opam

@@ -26,15 +26,12 @@ depends: [
   "uri" {>= "1.9.0"}
   "fieldslib"
   "sexplib"
-  "ppx_fields_conv" {>="v0.9.0"}
-  "ppx_sexp_conv" {>="v0.9.0"}
+  "ppx_fields_conv" {build & >="v0.9.0"}
+  "ppx_sexp_conv" {build & >="v0.9.0"}
   "stringext"
   "base64" {>= "2.0.0"}
-  "magic-mime"
-  "fmt"
-  "logs"
+  "fmt" {test}
   "jsonm" {build}
-  "ounit" {test}
   "alcotest" {test}
 ]
 available: [ocaml-version >= "4.03.0"]

repo/darwin/packages/upstream/cohttp.1.0.0/url

@@ -0,0 +1,2 @@
+archive: "https://github.com/mirage/ocaml-cohttp/releases/download/v1.0.0/cohttp-1.0.0.tbz"
+checksum: "756f590576d4a60ce2382ef89274b44b"

repo/darwin/packages/upstream/configurator.v0.10.0/opam

@@ -0,0 +1,16 @@
+opam-version: "1.2"
+maintainer: "[email protected]"
+authors: ["Jane Street Group, LLC <[email protected]>"]
+homepage: "https://github.com/janestreet/configurator"
+bug-reports: "https://github.com/janestreet/configurator/issues"
+dev-repo: "git+https://github.com/janestreet/configurator.git"
+license: "Apache-2.0"
+build: [
+  ["jbuilder" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "base"     {>= "v0.10" & < "v0.11"}
+  "stdio"    {>= "v0.10" & < "v0.11"}
+  "jbuilder" {build & >= "1.0+beta12"}
+]
+available: [ ocaml-version >= "4.04.1" ]

repo/darwin/packages/upstream/configurator.v0.10.0/url

@@ -0,0 +1,2 @@
+archive: "https://ocaml.janestreet.com/ocaml-core/v0.10/files/configurator-v0.10.0.tar.gz"
+checksum: "d02f66dd5dc4dbc3017f78c51209ba6b"