Merge pull request #2 from NathanReb/update-dune-port

Update dune port

ctypes-foreign.opam

@@ -18,10 +18,10 @@ depends: [
   "dune-configurator"
   "conf-pkg-config"
   "lwt" {with-test}
-  "ounit" {with-test}
+  "ounit2" {with-test}
   "conf-ncurses" {with-test}
   "stdlib-shims" {with-test}
-  "conf-fts" {with-test}
+  "conf-fts" {with-test & os != "win32"}
   "odoc" {with-doc}
 ]
 build: [

ctypes.opam

@@ -30,8 +30,9 @@ depends: [
   "integers"
   "dune-configurator"
   "bigarray-compat"
-  "ounit" {with-test}
-  "conf-fts" {with-test}
+  "ounit2" {with-test}
+  "conf-fts" {with-test & os != "win32"}
+  "conf-pkg-config" {with-test}
   "odoc" {with-doc}
 ]
 build: [

dune-project

@@ -18,8 +18,9 @@
   integers
   dune-configurator
   bigarray-compat
-  (ounit :with-test)
-  (conf-fts :with-test))
+  (ounit2 :with-test)
+  (conf-fts (and :with-test (<> :os win32)))
+  (conf-pkg-config :with-test))
  (synopsis "Combinators for binding to C libraries without writing any C")
  (description "
 ctypes is a library for binding to C libraries using pure OCaml. The primary
@@ -47,10 +48,10 @@ This will make the `ctypes-foreign` ocamlfind subpackage available."))
   dune-configurator
   conf-pkg-config
   (lwt :with-test)
-  (ounit :with-test)
+  (ounit2 :with-test)
   (conf-ncurses :with-test)
   (stdlib-shims :with-test)
-  (conf-fts :with-test))
+  (conf-fts (and :with-test (<> :os win32))))
  (synopsis "Dynamic access to foreign C libraries using Ctypes")
  (description "
 This installs the `ctypes-foreign` interface which

examples/fts/stub-generation/config/discover.ml

@@ -0,0 +1,25 @@
+module C = Configurator.V1
+
+let prepend opt flags =
+  if flags = [] then
+    []
+  else
+    opt :: flags
+
+let () =
+  C.main ~name:"fts_example" (fun c ->
+      let default : C.Pkg_config.package_conf = {
+        libs = [];
+        cflags = []
+      } in
+      let conf =
+        match C.Pkg_config.get c with
+        | None -> default
+        | Some pc ->
+          (match C.Pkg_config.query pc ~package:"libfts" with
+           | None -> default
+           | Some v -> v)
+      in
+      C.Flags.write_sexp "c_flags.sexp" (prepend "-ccopt" conf.cflags);
+      C.Flags.write_sexp "c_library_flags.sexp" (prepend "-cclib" conf.libs)
+    )

examples/fts/stub-generation/config/discover.mli

@@ -0,0 +1 @@
+(* empty *)

examples/fts/stub-generation/config/dune

@@ -0,0 +1,8 @@
+(executable
+ (name discover)
+ (libraries dune-configurator))
+
+(rule
+ (targets c_flags.sexp c_library_flags.sexp)
+ (action
+  (run ./discover.exe)))

examples/fts/stub-generation/dune

@@ -2,7 +2,10 @@
  (name fts_cmd)
  (enabled_if
   (= %{os_type} Unix))
- (libraries fts_stubs fts_generated))
+ (libraries fts_stubs fts_generated)
+ (link_flags
+  :standard
+  (:include config/c_library_flags.sexp)))
 
 (rule
  (alias runtest)

examples/fts/stub-generation/stub-generator/dune

@@ -20,5 +20,8 @@
  (modules fts_generated)
  (foreign_stubs
   (language c)
-  (names fts_stubs))
+  (names fts_stubs)
+  (flags
+   :standard
+   (:include ../config/c_flags.sexp)))
  (libraries ctypes.stubs))

tests/clib/dune

@@ -6,3 +6,18 @@
   (names test_functions))
  (c_library_flags -pthread)
  (libraries ctypes))
+
+(rule
+ (target clib%{ext_dll})
+ (deps (source_tree ../../src/ctypes) test_functions.h)
+ (action
+  (run
+   %{cc}
+   -I
+   ../../src/ctypes
+   -I
+   %{ocaml_where}
+   -o
+   %{target}
+   -shared
+   %{dep:test_functions.c})))

tests/test-alignment/dune

@@ -1,4 +1,4 @@
 (test
  (package ctypes-foreign)
  (name test_alignment)
- (libraries oUnit ctypes ctypes-foreign))
+ (libraries ounit2 ctypes ctypes-foreign))

tests/test-arrays/dune

@@ -1,10 +1,11 @@
 (test
  (name test_array)
  (package ctypes-foreign)
+ (deps ../clib/clib%{ext_dll})
  (link_flags
   (:include ../flags/link-flags.sexp))
  (libraries
-  oUnit
+  ounit2
   ctypes
   ctypes.stubs
   ctypes-foreign

tests/test-arrays/test_array.ml

@@ -8,6 +8,7 @@
 open OUnit2
 open Ctypes
 
+let _ = Dl.(dlopen ~filename:"../clib/clib.so" ~flags:[RTLD_NOW])
 
 (*
   Creating multidimensional arrays, and reading and writing elements.

tests/test-bigarrays/dune

@@ -1,10 +1,11 @@
 (test
  (name test_bigarrays)
  (package ctypes-foreign)
+ (deps ../clib/clib%{ext_dll})
  (link_flags
   (:include ../flags/link-flags.sexp))
  (libraries
-  oUnit
+  ounit2
   ctypes
   ctypes.stubs
   ctypes-foreign

tests/test-bigarrays/test_bigarrays.ml

@@ -8,6 +8,8 @@
 module Std_array = Array
 type 'a std_array = 'a array
 
+let _ = Dl.(dlopen ~filename:"../clib/clib.so" ~flags:[RTLD_NOW])
+
 open OUnit2
 open Ctypes
 module BA = Bigarray_compat

tests/test-bools/dune

@@ -1,10 +1,11 @@
 (test
  (name test_bools)
  (package ctypes-foreign)
+ (deps ../clib/clib%{ext_dll})
  (link_flags
   (:include ../flags/link-flags.sexp))
  (libraries
-  oUnit
+  ounit2
   ctypes
   ctypes.stubs
   ctypes-foreign

tests/test-bools/test_bools.ml

@@ -7,6 +7,8 @@
 
 open OUnit2
 
+let _ = Dl.(dlopen ~filename:"../clib/clib.so" ~flags:[RTLD_NOW])
+
 module Common_tests(S : Cstubs.FOREIGN with type 'a result = 'a
                                         and type 'a return = 'a) =
 struct

tests/test-builtins/dune

@@ -2,7 +2,7 @@
  (name test_builtins)
  (package ctypes-foreign)
  (libraries
-  oUnit
+  ounit2
   ctypes
   ctypes.stubs
   ctypes-foreign

tests/test-callback_lifetime/dune

@@ -1,10 +1,11 @@
 (test
  (name test_callback_lifetime)
  (package ctypes-foreign)
+ (deps ../clib/clib%{ext_dll})
  (link_flags
   (:include ../flags/link-flags.sexp))
  (libraries
-  oUnit
+  ounit2
   ctypes
   ctypes.stubs
   ctypes-foreign

tests/test-callback_lifetime/test_callback_lifetime.ml

@@ -10,6 +10,7 @@
 open OUnit2
 open Foreign
 
+let _ = Dl.(dlopen ~filename:"../clib/clib.so" ~flags:[RTLD_NOW])
 
 module Common_tests(S : Cstubs.FOREIGN with type 'a result = 'a
                                         and type 'a return = 'a) =

tests/test-closure-type-promotion/dune

@@ -1,10 +1,11 @@
 (test
  (name test_closure_type_promotion)
  (package ctypes-foreign)
+ (deps ../clib/clib%{ext_dll})
  (link_flags
   (:include ../flags/link-flags.sexp))
  (libraries
-  oUnit
+  ounit2
   ctypes
   ctypes.stubs
   ctypes-foreign

tests/test-closure-type-promotion/test_closure_type_promotion.ml

@@ -5,6 +5,8 @@
 
 open OUnit2
 
+let _testlib = Dl.(dlopen ~filename:"../clib/clib.so" ~flags:[RTLD_NOW])
+
 (*
  *  Using the closure API of libffi is error prone due to differences
  *  in endianess and calling conventions.

tests/test-coercions/dune

@@ -2,7 +2,7 @@
  (name test_coercions)
  (package ctypes-foreign)
  (libraries
-  oUnit
+  ounit2
   ctypes
   ctypes.stubs
   ctypes-foreign

tests/test-complex/dune

@@ -1,10 +1,11 @@
 (test
  (name test_complex)
  (package ctypes-foreign)
+ (deps ../clib/clib%{ext_dll})
  (link_flags
   (:include ../flags/link-flags.sexp))
  (libraries
-  oUnit
+  ounit2
   ctypes
   ctypes.stubs
   ctypes-foreign

tests/test-complex/test_complex.ml

@@ -8,6 +8,8 @@
 open OUnit2
 open Ctypes
 
+let _ = Dl.(dlopen ~filename:"../clib/clib.so" ~flags:[RTLD_NOW])
+
 module Common_tests(S : Cstubs.FOREIGN with type 'a result = 'a
                                         and type 'a return = 'a) =
 struct

tests/test-constants/dune

@@ -51,9 +51,10 @@
 (test
  (name test_constants)
  (package ctypes-foreign)
+ (deps ../clib/clib%{ext_dll})
  (modules test_constants)
  (libraries
-  oUnit
+  ounit2
   ctypes
   ctypes.stubs
   ctypes-foreign

tests/test-constants/test_constants.ml

@@ -9,7 +9,7 @@ open OUnit2
 open Ctypes
 
 
-let testlib = Dl.(dlopen ~filename:"../clib/dlltest_functions_stubs.so" ~flags:[RTLD_NOW])
+let testlib = Dl.(dlopen ~filename:"../clib/clib.so" ~flags:[RTLD_NOW])
 
 module Constants = Types.Struct_stubs(Generated_struct_bindings)
 

tests/test-cstdlib/dune

@@ -2,7 +2,7 @@
  (name test_cstdlib)
  (package ctypes-foreign)
  (libraries
-  oUnit
+  ounit2
   ctypes
   ctypes.stubs
   ctypes-foreign

tests/test-custom_ops/dune

@@ -1,3 +1,3 @@
 (test
  (name test_custom_ops)
- (libraries oUnit ctypes))
+ (libraries ounit2 ctypes))

tests/test-enums/dune

@@ -44,4 +44,4 @@
  (name test_enums)
  (modules test_enums)
  (package ctypes-foreign)
- (libraries oUnit ctypes test_enums_generated test_enums_stubs))
+ (libraries ounit2 ctypes test_enums_generated test_enums_stubs))

tests/test-finalisers/dune

@@ -1,3 +1,3 @@
 (test
  (name test_finalisers)
- (libraries ctypes oUnit))
+ (libraries ctypes ounit2))

tests/test-foreign-errno/dune

@@ -1,4 +1,4 @@
 (test
  (name test_errno)
  (package ctypes-foreign)
- (libraries oUnit ctypes ctypes-foreign))
+ (libraries ounit2 ctypes ctypes-foreign))

tests/test-foreign_values/dune

@@ -1,10 +1,11 @@
 (test
  (name test_foreign_values)
  (package ctypes-foreign)
+ (deps ../clib/clib%{ext_dll})
  (link_flags
   (:include ../flags/link-flags.sexp))
  (libraries
-  oUnit
+  ounit2
   ctypes
   ctypes.stubs
   ctypes-foreign

tests/test-foreign_values/test_foreign_values.ml

@@ -8,6 +8,7 @@
 open OUnit2
 open Ctypes
 
+let _ = Dl.(dlopen ~filename:"../clib/clib.so" ~flags:[RTLD_NOW])
 
 module Common_tests(S : Cstubs.FOREIGN with type 'a result = 'a
                                         and type 'a return = 'a) =

tests/test-higher_order/dune

@@ -1,10 +1,11 @@
 (test
  (name test_higher_order)
  (package ctypes-foreign)
+ (deps ../clib/clib%{ext_dll})
  (link_flags
   (:include ../flags/link-flags.sexp))
  (libraries
-  oUnit
+  ounit2
   ctypes
   ctypes.stubs
   ctypes-foreign

tests/test-higher_order/test_higher_order.ml

@@ -7,6 +7,7 @@
 
 open OUnit2
 
+let _ = Dl.(dlopen ~filename:"../clib/clib.so" ~flags:[RTLD_NOW])
 
 module Common_tests(S : Cstubs.FOREIGN with type 'a result = 'a
                                         and type 'a return = 'a) =

tests/test-integers/dune

@@ -1,10 +1,11 @@
 (test
  (name test_integers)
  (package ctypes-foreign)
+ (deps ../clib/clib%{ext_dll})
  (link_flags
   (:include ../flags/link-flags.sexp))
  (libraries
-  oUnit
+  ounit2
   ctypes
   ctypes.stubs
   ctypes-foreign

tests/test-integers/test_integers.ml

@@ -9,6 +9,8 @@ open OUnit2
 open Ctypes
 open Unsigned
 
+let _ = Dl.(dlopen ~filename:"../clib/clib.so" ~flags:[RTLD_NOW])
+
 module Common_tests(S : Cstubs.FOREIGN with type 'a result = 'a
                                         and type 'a return = 'a) =
 struct