Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove bigarray which is a part of the standard library #660

Merged
merged 5 commits into from
Nov 12, 2020
Merged

Remove bigarray which is a part of the standard library #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
06c3247
Use Bigarray_compat module instead of Bigarray
dinosaure Nov 6, 2020
7d90aca
Compilation depends on bigarray-compat instead bigarray library
dinosaure Nov 6, 2020
4be3afd
Update OPAM and META file according the replacement of bigarray by bi…
dinosaure Nov 6, 2020
1f05ada
Update tests to use bigarray-compat package instead of bigarray
dinosaure Nov 6, 2020
32a3c71
Update examples to use bigarray-compat
dinosaure Nov 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion META
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version = "0.17.1"
description = "Combinators for binding to C libraries without writing any C."
requires = "bigarray bytes integers"
requires = "bigarray-compat bytes integers"
archive(byte) = "ctypes.cma"
archive(byte, plugin) = "ctypes.cma"
archive(byte, toploop) = "ctypes.cma ctypes-top.cma"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ ctypes.cmi_only = ctypes_static ctypes_primitive_types ctypes_structs cstubs_int
ctypes.public = lDouble complexL ctypes posixTypes ctypes_types
ctypes.dir = src/ctypes
ctypes.extra_mls = ctypes_primitives.ml
ctypes.deps = bigarray integers
ctypes.deps = bigarray-compat integers
ctypes.linkdeps = integers_stubs
ctypes.install = yes
ctypes.install_native_objects = yes
Expand Down
20 changes: 10 additions & 10 deletions Makefile.examples
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fts-stub-generator.threads = yes
fts-stub-generator.deps = integers
fts-stub-generator.subproject_deps = ctypes cstubs \
ctypes-foreign fts-stubs
fts-stub-generator.deps = str unix bigarray integers
fts-stub-generator.deps = str unix bigarray-compat integers
fts-stub-generator: PROJECT=fts-stub-generator
fts-stub-generator: $$(NATIVE_TARGET)

Expand All @@ -24,7 +24,7 @@ fts-cmd.dir = examples/fts/stub-generation
fts-cmd.threads = yes
fts-cmd.subproject_deps = ctypes \
ctypes-foreign fts-stubs
fts-cmd.deps = str unix bigarray integers
fts-cmd.deps = str unix bigarray-compat integers
fts-cmd.extra_mls = fts_generated.ml
fts-cmd.extra_cs = fts_stubs.c
fts-cmd: CFLAGS+=-D_FILE_OFFSET_BITS=32
Expand All @@ -39,7 +39,7 @@ examples/fts/stub-generation/fts_generated.ml: fts-stub-generator
fts.install = no
fts.dir = examples/fts/foreign
fts.threads = yes
fts.deps = unix bigarray str integers
fts.deps = unix bigarray-compat str integers
fts.subproject_deps = ctypes ctypes-foreign
fts: PROJECT=fts
fts: $$(NATIVE_TARGET)
Expand All @@ -54,14 +54,14 @@ date-stubs: $$(LIB_TARGETS)
date-stub-generator.install = no
date-stub-generator.dir = examples/date/stub-generation/stub-generator
date-stub-generator.subproject_deps = ctypes cstubs date-stubs
date-stub-generator.deps = str unix bigarray integers
date-stub-generator.deps = str unix bigarray-compat integers
date-stub-generator: PROJECT=date-stub-generator
date-stub-generator: $$(NATIVE_TARGET)

date-cmd.install = no
date-cmd.dir = examples/date/stub-generation
date-cmd.subproject_deps = ctypes date-stubs
date-cmd.deps = str unix bigarray integers
date-cmd.deps = str unix bigarray-compat integers
date-cmd.extra_mls = date_generated.ml
date-cmd.extra_cs = date_stubs.c
date-cmd: PROJECT=date-cmd
Expand All @@ -76,15 +76,15 @@ date.install = no
date.dir = examples/date/foreign
date.threads = yes
date.subproject_deps = ctypes ctypes-foreign
date.deps = unix bigarray str integers
date.deps = unix bigarray-compat str integers
date: PROJECT=date
date: $$(NATIVE_TARGET)

# subproject: ncurses with stub generation
ncurses-stubs.install = no
ncurses-stubs.dir = examples/ncurses/stub-generation/bindings
ncurses-stubs.subproject_deps = ctypes
ncurses-stubs.deps = str unix bigarray integers
ncurses-stubs.deps = str unix bigarray-compat integers
ncurses-stubs: PROJECT=ncurses-stubs
ncurses-stubs: $$(NATIVE_TARGET) $$(LIB_TARGETS)

Expand All @@ -94,14 +94,14 @@ ncurses-stub-generator.threads = yes
ncurses-stub-generator.deps = integers
ncurses-stub-generator.subproject_deps = ctypes cstubs \
ctypes-foreign ncurses-stubs
ncurses-stub-generator.deps = str unix bigarray integers
ncurses-stub-generator.deps = str unix bigarray-compat integers
ncurses-stub-generator: PROJECT=ncurses-stub-generator
ncurses-stub-generator: $$(NATIVE_TARGET)

ncurses-cmd.install = no
ncurses-cmd.dir = examples/ncurses/stub-generation
ncurses-cmd.subproject_deps = ctypes ncurses-stubs
ncurses-cmd.deps = str unix bigarray integers
ncurses-cmd.deps = str unix bigarray-compat integers
ncurses-cmd.extra_mls = ncurses_generated.ml
ncurses-cmd.extra_cs = ncurses_stubs.c
ncurses-cmd.link_flags = -lncurses
Expand All @@ -117,7 +117,7 @@ ncurses.install = no
ncurses.dir = examples/ncurses/foreign
ncurses.threads = yes
ncurses.subproject_deps = ctypes ctypes-foreign
ncurses.deps = unix bigarray str integers
ncurses.deps = unix bigarray-compat str integers
ncurses.link_flags = -lncurses
ncurses: PROJECT=ncurses
ncurses: $$(NATIVE_TARGET)
Expand Down
Loading