113.24.00

CHANGES.md

@@ -1,3 +1,8 @@
+## 113.24.00
+
+Keep up to date with interface changes in `Async_kernel`, `Async_extra` and
+`Async_unix`.
+
 ## 113.00.00
 
 - Added `Async.Std.Printf` module so that one doesn't unintentionally use

META.ab

@@ -0,0 +1,7 @@
+version = "$(pkg_version)"
+description = "Monadic concurrency library"
+requires = "async_extra async_kernel async_unix bin_prot core fieldslib ppx_assert.runtime-lib ppx_bench.runtime-lib ppx_expect.collector ppx_inline_test.runtime-lib sexplib typerep variantslib"
+archive(byte          ) = "async.cma"
+archive(native        ) = "async.cmxa"
+archive(native, plugin) = "async.cmxs"
+exists_if = "async.cma"

Makefile

@@ -1,24 +1,20 @@
 # Generic Makefile for oasis project
 
-# Set to setup.exe for the release
-SETUP := setup-dev.exe
+SETUP := setup.exe
+NAME := async
+PREFIX = $(shell grep ^prefix= setup.data | cut -d\" -f 2)
 
 # Default rule
 default: build
 
-# Setup for the development version
-setup-dev.exe: _oasis setup.ml
-	grep -v '^#' setup.ml > setup_dev.ml
-	ocamlfind ocamlopt -o $@ -linkpkg -package ocamlbuild,oasis.dynrun setup_dev.ml || 	  ocamlfind ocamlc -o $@ -linkpkg -package ocamlbuild,oasis.dynrun setup_dev.ml || true
-	rm -f setup_dev.*
-
-# Setup for the release
-setup.exe: setup.ml
-	ocamlopt.opt -o $@ $< || ocamlopt -o $@ $< || ocamlc -o $@ $<
-	rm -f setup.cmx setup.cmi setup.o setup.obj setup.cmo
+setup.exe: _oasis setup.ml
+	ocamlfind ocamlopt -o $@ -linkpkg -package ocamlbuild,oasis.dynrun setup.ml || \
+	  ocamlfind ocamlc -o $@ -linkpkg -package ocamlbuild,oasis.dynrun setup.ml || true
+	for f in setup.*; do [ $$f = $@ -o $$f = setup.ml ] || rm -f $$f; done
 
 build: $(SETUP) setup.data
 	./$(SETUP) -build $(BUILDFLAGS)
+	$(MAKE) $(NAME).install
 
 doc: $(SETUP) setup.data build
 	./$(SETUP) -doc $(DOCFLAGS)
@@ -28,15 +24,34 @@ test: $(SETUP) setup.data build
 
 all: $(SETUP)
 	./$(SETUP) -all $(ALLFLAGS)
-
-install: $(SETUP) setup.data
-	./$(SETUP) -install $(INSTALLFLAGS)
-
-uninstall: $(SETUP) setup.data
-	./$(SETUP) -uninstall $(UNINSTALLFLAGS)
-
-reinstall: $(SETUP) setup.data
-	./$(SETUP) -reinstall $(REINSTALLFLAGS)
+	$(MAKE) $(NAME).install
+
+$(NAME).install: js-utils/gen_install.ml setup.log setup.data
+	ocaml -I js-utils js-utils/gen_install.ml
+
+install: $(NAME).install
+	opam-installer -i --prefix $(PREFIX) $(NAME).install
+
+uninstall: $(NAME).install
+	opam-installer -u --prefix $(PREFIX) $(NAME).install
+
+reinstall: $(NAME).install
+	opam-installer -u --prefix $(PREFIX) $(NAME).install &> /dev/null || true
+	opam-installer -i --prefix $(PREFIX) $(NAME).install
+
+bin.tar.gz: $(NAME).install
+	rm -rf _install
+	mkdir _install
+	opam-installer -i --prefix _install $(NAME).install
+	tar czf bin.tar.gz -C _install .
+	rm -rf _install
+
+bin.lzo: $(NAME).install
+	rm -rf _install
+	mkdir _install
+	opam-installer -i --prefix _install $(NAME).install
+	cd _install && lzop -1 -P -o ../bin.lzo `find . -type f`
+	rm -rf _install
 
 clean: $(SETUP)
 	./$(SETUP) -clean $(CLEANFLAGS)

_oasis

@@ -1,116 +1,44 @@
-OASISFormat:      0.3
-OCamlVersion:     >= 4.00.0
-FindlibVersion:   >= 1.3.2
-Name:             async
-Version:          113.00.00
-Synopsis:         Jane Street Capital's asynchronous execution library
-Authors:          Jane Street Group, LLC <opensource@janestreet.com>
-Copyrights:       (C) 2008-2013 Jane Street Group LLC <opensource@janestreet.com>
-Maintainers:      Jane Street Group, LLC <opensource@janestreet.com>
-License:          Apache-2.0
-LicenseFile:      LICENSE.txt
-Homepage:         https://github.com/janestreet/async
-Plugins:          StdFiles (0.3), DevFiles (0.3), META (0.3)
-XStdFilesAUTHORS: false
-XStdFilesREADME:  false
-BuildTools:       ocamlbuild, camlp4o
+OASISFormat:           0.4
+OCamlVersion:          >= 4.02.3
+FindlibVersion:        >= 1.3.2
+Name:                  async
+Version:               113.24.00
+Synopsis:              Monadic concurrency library
+Authors:               Jane Street Group, LLC <opensource@janestreet.com>
+Copyrights:            (C) 2008-2016 Jane Street Group LLC <opensource@janestreet.com>
+Maintainers:           Jane Street Group, LLC <opensource@janestreet.com>
+License:               Apache-2.0
+LicenseFile:           LICENSE.txt
+Homepage:              https://github.com/janestreet/async
+Plugins:               StdFiles (0.3), DevFiles (0.3), META (0.3)
+XStdFilesAUTHORS:      false
+XStdFilesREADME:       false
+BuildTools:            ocamlbuild
+AlphaFeatures:         ocamlbuild_more_args
+XOCamlbuildPluginTags: package(ppx_driver.ocamlbuild)
+FilesAB:               META.ab
 Description:
-  Part of Jane Street’s Core library.
-  .
+  Part of Jane Street’s Core library
   The Core suite of libraries is an industrial strength alternative to
   OCaml's standard library that was developed by Jane Street, the
   largest industrial user of OCaml.
 
-# +-------------------------------------------------------------------+
-# | Library                                                           |
-# +-------------------------------------------------------------------+
-
 Library async
-  Path:               src
-  FindlibName:        async
-  Pack:               true
-  Modules:            Clock_unit_tests,
-                      Scheduler_unit_tests,
-                      Std
-  BuildDepends:       async_kernel,
-                      async_unix,
-                      async_extra,
-                      pa_ounit,
-                      pa_ounit.syntax,
-                      pa_test,
-                      pa_test.syntax,
-                      threads
-  XMETARequires:      async_kernel,
-                      async_unix,
-                      async_extra,
-                      pa_ounit,
-                      threads
-
-# +-------------------------------------------------------------------+
-# | Tests                                                             |
-# +-------------------------------------------------------------------+
-
-Executable test_runner
-  Path:               test
-  MainIs:             test_runner.ml
-  Build$:             flag(tests)
-  CompiledObject:     best
-  Install:            false
-  BuildDepends:       async
-
-Test test_runner
-  Run$:               flag(tests)
-  Command:            $test_runner
-  WorkingDirectory:   lib_test
-
-# +-------------------------------------------------------------------+
-# | Benchmarks                                                        |
-# +-------------------------------------------------------------------+
-
-Executable handlers
-  Path:               bench
-  MainIs:             handlers.ml
-  Build$:             flag(tests)
-  CompiledObject:     best
-  Install:            false
-  BuildDepends:       async
-
-Executable loop
-  Path:               bench
-  MainIs:             loop.ml
-  Build$:             flag(tests)
-  CompiledObject:     best
-  Install:            false
-  BuildDepends:       async
-
-Executable nanos_per_job
-  Path:               bench
-  MainIs:             nanos_per_job.ml
-  Build$:             flag(tests)
-  CompiledObject:     best
-  Install:            false
-  BuildDepends:       async
-
-Executable queens
-  Path:               bench
-  MainIs:             queens.ml
-  Build$:             flag(tests)
-  CompiledObject:     best
-  Install:            false
-  BuildDepends:       async
-
-Executable squash
-  Path:               bench
-  MainIs:             squash.ml
-  Build$:             flag(tests)
-  CompiledObject:     best
-  Install:            false
-  BuildDepends:       async
-
-Executable tco
-  Path:               bench
-  MainIs:             tco.ml
-  Build$:             flag(tests)
-  CompiledObject:     best
-  Install:            false
-  BuildDepends:       async
+  Path:         src
+  Pack:         true
+  Modules:      Clock_unit_tests,
+                Scheduler_unit_tests,
+                Std
+  BuildDepends: async_extra,
+                async_kernel,
+                async_unix,
+                bin_prot,
+                core,
+                fieldslib,
+                ppx_assert.runtime-lib,
+                ppx_bench.runtime-lib,
+                ppx_expect.collector,
+                ppx_inline_test.runtime-lib,
+                sexplib,
+                typerep,
+                variantslib

_tags

@@ -1,3 +1,8 @@
+<**/*.ml{,i}>: warn(-40), no_alias_deps
+<**/*>: thread
+# This prevents the implicit addition of -ppx options by ocamlfind
+<**/*.ml{,i}>: predicate(ppx_driver)
+<src/*.ml>: for-pack(Async)
+<src/*.ml{,i}>: pp(ppx-jane -dump-ast -inline-test-lib async)
 # OASIS_START
 # OASIS_STOP
-<src/*.ml>: syntax_camlp4o

bench/nanos_per_job.ml

@@ -13,7 +13,7 @@ let () =
           num_live_jobs
           (Float.iround_nearest_exn (Time.Span.to_ns elapsed /. Float.of_int !num_jobs));
         Ivar.fill finished ());
-      for _i = 1 to num_live_jobs do
+      for _ = 1 to num_live_jobs do
         let rec loop () =
           upon Deferred.unit (fun () ->
             incr num_jobs;

bench/squash.ml

@@ -1,5 +1,5 @@
-open Core.Std   let _ = _squelch_unused_module_warning_
-open Async.Std  let _ = _squelch_unused_module_warning_
+open! Core.Std
+open! Async.Std
 
 open Core_bench.Std
 

descr

@@ -0,0 +1,5 @@
+Monadic concurrency library
+Part of Jane Street’s Core library
+The Core suite of libraries is an industrial strength alternative to
+OCaml's standard library that was developed by Jane Street, the
+largest industrial user of OCaml.

example/bin_prot_test.ml

@@ -15,7 +15,7 @@ type test =
     f : [`Foo | `Bar] array;
     g : float array;
   }
-with bin_io
+[@@deriving bin_io]
 
 (* This value is very likely larger than e.g. an order, fill, etc. *)
 let test =