port ctypes-foreign to use virtual modules

This turns ctypes-foreign.threaded/unthreaded into variant
libraries that implement the `foreign.mli` that is exposed
by the ctypes_foreign library.

The Makefile infrastructure did this by duplicating foreign.mli
and using -no-keep-locs.  The dune-based approach is a bit more
high-level as it verifies that there is no extra module leakage
aside from the virtual modules' cmi that are exposed.

Also add ppx_bisect conditionally while in here.

ctypes.opam

@@ -8,19 +8,19 @@ homepage: "https://github.com/ocamllabs/ocaml-ctypes"
 bug-reports: "http://github.com/ocamllabs/ocaml-ctypes/issues"
 pin-depends: [
   [ "integers.dev" "git+http://github.com/yallop/ocaml-integers.git" ]
-  [ "dune.dev" "git+http://github.com/ocaml/dune.git" ]
+  [ "dune.dev" "git+http://github.com/Chris00/dune.git" ]
 ]
 depends: [
   "ocaml" {>= "4.02.3"}
   "integers"
+  "bisect_ppx"
   "dune" {build}
   "conf-pkg-config" {build}
   "lwt" {with-test & < "4.0.0"}
   "ounit" {with-test}
   "conf-ncurses" {with-test}
 ]
 depopts: [
-  "bisect_ppx" {with-test}
   "ocveralls" {with-test}
 ]
 build: [

dune-project

@@ -1,2 +1,2 @@
-(lang dune 1.0)
-(name ctypes)
+(lang dune 1.7)
+(name ctypes)

examples/date/foreign/dune

@@ -1,3 +1,3 @@
 (executables
  (names date)
- (libraries ctypes-foreign))
+ (libraries ctypes-foreign.threaded))

examples/fts/foreign/dune

@@ -1,3 +1,3 @@
 (executables
  (names fts_cmd)
- (libraries ctypes-foreign))
+ (libraries ctypes-foreign.threaded))

examples/ncurses/foreign/dune

@@ -2,7 +2,7 @@
  (name ncurses)
  (c_library_flags -lncurses)
  (modules ncurses)
- (libraries ctypes-foreign))
+ (libraries ctypes-foreign.threaded))
 
 (executables
  (names ncurses_cmd)

src/cstubs/dune

@@ -1,5 +1,6 @@
 (library
  (name ctypes_stubs)
  (public_name ctypes.stubs)
+ (preprocess (pps bisect_ppx -conditional))
  (wrapped false)
  (libraries ctypes str))

src/ctypes-foreign-base/dune

@@ -11,6 +11,7 @@
 (library
  (name ctypes_foreign_base)
  (public_name ctypes-foreign.base)
+ (preprocess (pps bisect_ppx -conditional))
  (wrapped false)
  (libraries ctypes)
  (c_library_flags (:include c_library_flags.sexp))

src/ctypes-foreign-threaded/dune

@@ -1,6 +1,8 @@
 (library
  (name ctypes_foreign_threaded)
  (public_name ctypes-foreign.threaded)
- (wrapped false)
- (libraries ctypes ctypes-foreign.base threads)
+ (preprocess (pps bisect_ppx -conditional))
+ (libraries ctypes threads)
+ (private_modules Ctypes_foreign_threaded_stubs)
+ (implements ctypes_foreign)
  (c_names foreign_threaded_stubs))

src/ctypes-foreign-unthreaded/dune

@@ -1,5 +1,7 @@
 (library
  (name ctypes_foreign_unthreaded)
  (public_name ctypes-foreign.unthreaded)
- (wrapped false)
- (libraries ctypes ctypes-foreign.base))
+ (private_modules ctypes_gc_mutex)
+ (preprocess (pps bisect_ppx -conditional))
+ (implements ctypes-foreign)
+ (libraries ctypes))

src/ctypes-foreign/dune

@@ -1,5 +1,6 @@
 (library
  (name ctypes_foreign)
  (public_name ctypes-foreign)
- ;; TODO below needed until https://github.com/ocaml/dune/issues/1724 is resolved
- (libraries ctypes-foreign.threaded))
+ (wrapped false)
+ (libraries ctypes-foreign.base)
+ (virtual_modules foreign))

src/ctypes/dune

@@ -7,6 +7,7 @@
  (wrapped false)
  (libraries bigarray bytes integers)
  (modules_without_implementation ctypes_types)
+ (preprocess (pps bisect_ppx -conditional))
  (install_c_headers
    ctypes_raw_pointer
    ctypes_primitives