Skip to content

Commit e2aea4e

Browse files
committed
Port to dune
Signed-off-by: Rudi Grinberg <[email protected]>
1 parent f8f7fa0 commit e2aea4e

File tree

13 files changed

+68
-87
lines changed

13 files changed

+68
-87
lines changed

dune-project

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
(lang dune 1.0)
2+
(name ctypes)

src/configure/dune

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
(library
2+
(name extract_from_c)
3+
(modules extract_from_c)
4+
(libraries str))
5+
6+
(executable
7+
(name gen_c_primitives)
8+
(libraries extract_from_c)
9+
(modules gen_c_primitives))
10+
11+
(executable
12+
(name gen_libffi_abi)
13+
(libraries extract_from_c)
14+
(modules gen_libffi_abi))

src/configure/jbuild

-16
This file was deleted.

src/cstubs/jbuild

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
(jbuild_version 1)
2-
31
(library
4-
((name ctypes_stubs)
5-
(public_name ctypes.stubs)
6-
(wrapped false)
7-
(libraries (ctypes))))
2+
(name ctypes_stubs)
3+
(public_name ctypes.stubs)
4+
(wrapped false)
5+
(libraries ctypes))

src/ctypes-foreign-base/config/discover.ml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
open Base
2-
open Stdio
1+
module C = Configurator.V1
32

43
let () =
5-
let module C = Configurator in
64
C.main ~name:"ffi" (fun c ->
75
let default : C.Pkg_config.package_conf = {
86
libs = ["-lffi"];

src/ctypes-foreign-base/config/dune

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
(executable
2+
(name discover)
3+
(libraries dune.configurator))

src/ctypes-foreign-base/config/jbuild

-5
This file was deleted.

src/ctypes-foreign-base/dune

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
(rule
2+
(action (copy# "dl_stubs.c.%{read:backend.sexp}" dl_stubs.c)))
3+
4+
(rule
5+
(action (copy# "dl.ml.%{read:backend.sexp}" dl.ml)))
6+
7+
(rule
8+
(with-stdout-to libffi_abi.ml (run ../configure/gen_libffi_abi.exe)))
9+
10+
(library
11+
(name ctypes_foreign_base)
12+
(public_name ctypes.foreign.base)
13+
(wrapped false)
14+
(libraries ctypes)
15+
(c_library_flags (:include c_library_flags.sexp))
16+
(c_flags (:include c_flags.sexp))
17+
(c_names dl_stubs ffi_call_stubs ffi_type_stubs))
18+
19+
(rule
20+
(targets c_flags.sexp c_library_flags.sexp backend.sexp)
21+
(action (run ./config/discover.exe)))

src/ctypes-foreign-base/jbuild

-28
This file was deleted.

src/ctypes-foreign-threaded/dune

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
(library
2+
(name ctypes_foreign_threaded)
3+
(public_name ctypes.foreign.threaded)
4+
(wrapped false)
5+
(libraries ctypes.foreign.base threads)
6+
(c_names foreign_threaded_stubs))

src/ctypes-foreign-threaded/jbuild

-8
This file was deleted.

src/ctypes-foreign-unthreaded/jbuild

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
(jbuild_version 1)
2-
31
(library
4-
((name ctypes_foreign_unthreaded)
5-
(public_name ctypes.foreign.unthreaded)
6-
(wrapped false)
7-
(libraries (ctypes.foreign.base))))
2+
(name ctypes_foreign_unthreaded)
3+
(public_name ctypes.foreign.unthreaded)
4+
(wrapped false)
5+
(libraries ctypes.foreign.base))

src/ctypes/jbuild

+13-15
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
1-
(jbuild_version 1)
2-
31
(rule
42
(with-stdout-to ctypes_primitives.ml (run ../configure/gen_c_primitives.exe)))
53

64
(library
7-
((name ctypes)
8-
(public_name ctypes)
9-
(wrapped false)
10-
(libraries (bigarray bytes integers))
11-
(c_names
12-
(complex_stubs
13-
ctypes_bigarrays
14-
ctypes_roots
15-
ldouble_stubs
16-
managed_buffer_stubs
17-
posix_types_stubs
18-
raw_pointer_stubs
19-
type_info_stubs))))
5+
(name ctypes)
6+
(public_name ctypes)
7+
(wrapped false)
8+
(libraries bigarray bytes integers)
9+
(c_names
10+
complex_stubs
11+
ctypes_bigarrays
12+
ctypes_roots
13+
ldouble_stubs
14+
managed_buffer_stubs
15+
posix_types_stubs
16+
raw_pointer_stubs
17+
type_info_stubs))

0 commit comments

Comments
 (0)