mirror of
https://github.com/c-cube/iter.git
synced 2025-12-06 11:15:32 -05:00
move to jbuilder
This commit is contained in:
Simon Cruanes
parent
d860c832e0
commit
2a989a2cf3
15 changed files with 108 additions and 870 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -4,6 +4,5 @@ _build
|
||||||
*.docdir
|
*.docdir
|
||||||
*.html
|
*.html
|
||||||
man/
|
man/
|
||||||
sequence.install
|
*.install
|
||||||
setup.log
|
.merlin
|
||||||
setup.data
|
|
||||||
|
|
|
||||||
11
META
11
META
|
|
@ -1,11 +0,0 @@
|
||||||
# OASIS_START
|
|
||||||
# DO NOT EDIT (digest: 1e28d93f3671e8db9acf63b73cdbca82)
|
|
||||||
version = "0.4.1"
|
|
||||||
description = "Simple sequence (iterator) datatype and combinators"
|
|
||||||
archive(byte) = "sequence.cma"
|
|
||||||
archive(byte, plugin) = "sequence.cma"
|
|
||||||
archive(native) = "sequence.cmxa"
|
|
||||||
archive(native, plugin) = "sequence.cmxs"
|
|
||||||
exists_if = "sequence.cma"
|
|
||||||
# OASIS_STOP
|
|
||||||
|
|
||||||
75
Makefile
75
Makefile
|
|
@ -1,79 +1,30 @@
|
||||||
# OASIS_START
|
|
||||||
# DO NOT EDIT (digest: a3c674b4239234cbbe53afe090018954)
|
|
||||||
|
|
||||||
SETUP = ocaml setup.ml
|
all: build test
|
||||||
|
|
||||||
build: setup.data
|
build:
|
||||||
$(SETUP) -build $(BUILDFLAGS)
|
jbuilder build @install
|
||||||
|
|
||||||
doc: setup.data build
|
test:
|
||||||
$(SETUP) -doc $(DOCFLAGS)
|
jbuilder runtest
|
||||||
|
|
||||||
test: setup.data build
|
|
||||||
$(SETUP) -test $(TESTFLAGS)
|
|
||||||
|
|
||||||
all:
|
|
||||||
$(SETUP) -all $(ALLFLAGS)
|
|
||||||
|
|
||||||
install: setup.data
|
|
||||||
$(SETUP) -install $(INSTALLFLAGS)
|
|
||||||
|
|
||||||
uninstall: setup.data
|
|
||||||
$(SETUP) -uninstall $(UNINSTALLFLAGS)
|
|
||||||
|
|
||||||
reinstall: setup.data
|
|
||||||
$(SETUP) -reinstall $(REINSTALLFLAGS)
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(SETUP) -clean $(CLEANFLAGS)
|
jbuilder clean
|
||||||
|
|
||||||
distclean:
|
doc:
|
||||||
$(SETUP) -distclean $(DISTCLEANFLAGS)
|
jbuilder build @doc
|
||||||
|
|
||||||
setup.data:
|
BENCH_TARGETS=bench_persistent_read.exe bench_persistent.exe
|
||||||
$(SETUP) -configure $(CONFIGUREFLAGS)
|
|
||||||
|
|
||||||
configure:
|
benchs:
|
||||||
$(SETUP) -configure $(CONFIGUREFLAGS)
|
jbuilder build $(addprefix bench/, $(BENCH_TARGETS))
|
||||||
|
|
||||||
.PHONY: build doc test all install uninstall reinstall clean distclean configure
|
|
||||||
|
|
||||||
# OASIS_STOP
|
|
||||||
|
|
||||||
QTEST_PREAMBLE=''
|
|
||||||
DONTTEST=src/sequenceLabels.ml
|
|
||||||
QTESTABLE=$(filter-out $(DONTTEST), \
|
|
||||||
$(wildcard src/*.ml) \
|
|
||||||
$(wildcard src/*.mli) \
|
|
||||||
)
|
|
||||||
|
|
||||||
qtest-clean:
|
|
||||||
@rm -rf qtest/
|
|
||||||
|
|
||||||
qtest-gen:
|
|
||||||
@mkdir -p qtest
|
|
||||||
@if which qtest > /dev/null ; then \
|
|
||||||
qtest extract --preamble $(QTEST_PREAMBLE) \
|
|
||||||
-o qtest/run_qtest.ml \
|
|
||||||
$(QTESTABLE) 2> /dev/null ; \
|
|
||||||
else touch qtest/run_qtest.ml ; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
examples:
|
examples:
|
||||||
ocamlbuild examples/test_sexpr.native
|
jbuilder build examples/test_sexpr.exe
|
||||||
|
|
||||||
push_doc: all doc
|
push_doc: all doc
|
||||||
scp -r sequence.docdir/* cedeela.fr:~/simon/root/software/sequence/
|
scp -r sequence.docdir/* cedeela.fr:~/simon/root/software/sequence/
|
||||||
|
|
||||||
push_stable: all
|
VERSION=$(shell awk '/^version:/ {print $$2}' sequence.opam)
|
||||||
git checkout stable
|
|
||||||
git merge master -m 'merge from master'
|
|
||||||
oasis setup
|
|
||||||
git commit -a -m 'oasis files'
|
|
||||||
git push origin
|
|
||||||
git checkout master
|
|
||||||
|
|
||||||
VERSION=$(shell awk '/^Version:/ {print $$2}' _oasis)
|
|
||||||
|
|
||||||
update_next_tag:
|
update_next_tag:
|
||||||
@echo "update version to $(VERSION)..."
|
@echo "update version to $(VERSION)..."
|
||||||
|
|
|
||||||
103
_oasis
103
_oasis
|
|
@ -1,103 +0,0 @@
|
||||||
OASISFormat: 0.4
|
|
||||||
Name: sequence
|
|
||||||
Version: 0.11
|
|
||||||
Homepage: https://github.com/c-cube/sequence
|
|
||||||
Authors: Simon Cruanes
|
|
||||||
License: BSD-2-clause
|
|
||||||
LicenseFile: LICENSE
|
|
||||||
Plugins: META (0.3), DevFiles (0.3)
|
|
||||||
BuildTools: ocamlbuild
|
|
||||||
|
|
||||||
Synopsis: Simple sequence (iterator) datatype and combinators
|
|
||||||
Description:
|
|
||||||
Simple sequence datatype, intended to transfer a finite number of
|
|
||||||
elements from one data structure to another. Some transformations on sequences,
|
|
||||||
like `filter`, `map`, `take`, `drop` and `append` can be performed before the
|
|
||||||
sequence is iterated/folded on.
|
|
||||||
|
|
||||||
Flag bench
|
|
||||||
Description: enable benchmarks (require library Benchmark)
|
|
||||||
Default: false
|
|
||||||
|
|
||||||
Flag invert
|
|
||||||
Description: build sequence.invert (requires Delimcc)
|
|
||||||
Default: false
|
|
||||||
|
|
||||||
Flag bigarray
|
|
||||||
Description: build sequence.bigarray (requires bigarray)
|
|
||||||
Default: true
|
|
||||||
|
|
||||||
Library "sequence"
|
|
||||||
Path: src/
|
|
||||||
Modules: Sequence, SequenceLabels
|
|
||||||
BuildDepends: bytes, result
|
|
||||||
|
|
||||||
Library "invert"
|
|
||||||
Path: src/invert
|
|
||||||
Build$: flag(invert)
|
|
||||||
Install$: flag(invert)
|
|
||||||
Modules: SequenceInvert
|
|
||||||
FindlibName: invert
|
|
||||||
FindlibParent: sequence
|
|
||||||
BuildDepends: sequence,delimcc
|
|
||||||
|
|
||||||
Library "bigarray"
|
|
||||||
Path: src/bigarray
|
|
||||||
Build$: flag(bigarray)
|
|
||||||
Install$: flag(bigarray)
|
|
||||||
Modules: SequenceBigarray
|
|
||||||
FindlibName: bigarray
|
|
||||||
FindlibParent: sequence
|
|
||||||
BuildDepends: sequence,bigarray
|
|
||||||
|
|
||||||
Document sequence
|
|
||||||
Title: Sequence docs
|
|
||||||
Type: ocamlbuild (0.3)
|
|
||||||
BuildTools+: ocamldoc
|
|
||||||
Install: true
|
|
||||||
XOCamlbuildPath: .
|
|
||||||
XOCamlbuildLibraries: sequence
|
|
||||||
|
|
||||||
PreBuildCommand: make qtest-gen
|
|
||||||
|
|
||||||
Executable run_qtest
|
|
||||||
Path: qtest/
|
|
||||||
Install: false
|
|
||||||
CompiledObject: native
|
|
||||||
MainIs: run_qtest.ml
|
|
||||||
Build$: flag(tests)
|
|
||||||
BuildDepends: sequence, qcheck
|
|
||||||
|
|
||||||
Test all
|
|
||||||
Command: ./run_qtest.native
|
|
||||||
TestTools: run_qtest
|
|
||||||
Run$: flag(tests)
|
|
||||||
|
|
||||||
Executable benchs
|
|
||||||
Path: bench
|
|
||||||
Install: false
|
|
||||||
CompiledObject: native
|
|
||||||
Build$: flag(bench)
|
|
||||||
BuildDepends: sequence,benchmark
|
|
||||||
MainIs: benchs.ml
|
|
||||||
|
|
||||||
Executable bench_persistent
|
|
||||||
Path: bench
|
|
||||||
Install: false
|
|
||||||
CompiledObject: native
|
|
||||||
Build$: flag(bench)
|
|
||||||
BuildDepends: sequence,benchmark
|
|
||||||
MainIs: bench_persistent.ml
|
|
||||||
|
|
||||||
Executable bench_persistent_read
|
|
||||||
Path: bench
|
|
||||||
Install: false
|
|
||||||
CompiledObject: native
|
|
||||||
Build$: flag(bench)
|
|
||||||
BuildDepends: sequence,benchmark
|
|
||||||
MainIs: bench_persistent_read.ml
|
|
||||||
|
|
||||||
SourceRepository head
|
|
||||||
Type: git
|
|
||||||
Location: https://github.com/c-cube/sequence
|
|
||||||
Browser: https://github.com/c-cube/sequence/tree/master/src
|
|
||||||
35
_tags
35
_tags
|
|
@ -1,35 +0,0 @@
|
||||||
# OASIS_START
|
|
||||||
# DO NOT EDIT (digest: ffd3fbaf00b431777fea1b8279203bf9)
|
|
||||||
# Ignore VCS directories, you can use the same kind of rule outside
|
|
||||||
# OASIS_START/STOP if you want to exclude directories that contains
|
|
||||||
# useless stuff for the build process
|
|
||||||
<**/.svn>: -traverse
|
|
||||||
<**/.svn>: not_hygienic
|
|
||||||
".bzr": -traverse
|
|
||||||
".bzr": not_hygienic
|
|
||||||
".hg": -traverse
|
|
||||||
".hg": not_hygienic
|
|
||||||
".git": -traverse
|
|
||||||
".git": not_hygienic
|
|
||||||
"_darcs": -traverse
|
|
||||||
"_darcs": not_hygienic
|
|
||||||
# Library sequence
|
|
||||||
"sequence.cmxs": use_sequence
|
|
||||||
# Executable benchs
|
|
||||||
"bench/benchs.native": pkg_benchmark
|
|
||||||
"bench/benchs.native": use_sequence
|
|
||||||
# Executable bench_persistent
|
|
||||||
"bench/bench_persistent.native": pkg_benchmark
|
|
||||||
"bench/bench_persistent.native": use_sequence
|
|
||||||
# Executable bench_persistent_read
|
|
||||||
"bench/bench_persistent_read.native": pkg_benchmark
|
|
||||||
"bench/bench_persistent_read.native": use_sequence
|
|
||||||
<bench/*.ml{,i}>: pkg_benchmark
|
|
||||||
<bench/*.ml{,i}>: use_sequence
|
|
||||||
# OASIS_STOP
|
|
||||||
true: safe_string, bin_annot, color(always)
|
|
||||||
<**/*.ml>: warn(+a-4-44-48@8)
|
|
||||||
<src/bigarray/*.ml>: warn(-33)
|
|
||||||
true: mark_tag_used
|
|
||||||
<**/*.cmx>: optimize(3)
|
|
||||||
<src/*Labels.cm*>: nolabels
|
|
||||||
8
bench/jbuild
Normal file
8
bench/jbuild
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
|
||||||
|
(executables
|
||||||
|
((names (bench_persistent_read bench_persistent))
|
||||||
|
(libraries (sequence benchmark))
|
||||||
|
(flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -color always))
|
||||||
|
(ocamlopt_flags (:standard -O3 -color always
|
||||||
|
-unbox-closures -unbox-closures-factor 20))
|
||||||
|
))
|
||||||
8
examples/jbuild
Normal file
8
examples/jbuild
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
|
||||||
|
(executable
|
||||||
|
((name test_sexpr)
|
||||||
|
(libraries (sequence))
|
||||||
|
(flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -color always))
|
||||||
|
(ocamlopt_flags (:standard -O3 -color always
|
||||||
|
-unbox-closures -unbox-closures-factor 20))
|
||||||
|
))
|
||||||
609
myocamlbuild.ml
609
myocamlbuild.ml
|
|
@ -1,609 +0,0 @@
|
||||||
(* OASIS_START *)
|
|
||||||
(* DO NOT EDIT (digest: 958ece46307b808952e439e1cc47a739) *)
|
|
||||||
module OASISGettext = struct
|
|
||||||
(* # 22 "src/oasis/OASISGettext.ml" *)
|
|
||||||
|
|
||||||
|
|
||||||
let ns_ str =
|
|
||||||
str
|
|
||||||
|
|
||||||
|
|
||||||
let s_ str =
|
|
||||||
str
|
|
||||||
|
|
||||||
|
|
||||||
let f_ (str: ('a, 'b, 'c, 'd) format4) =
|
|
||||||
str
|
|
||||||
|
|
||||||
|
|
||||||
let fn_ fmt1 fmt2 n =
|
|
||||||
if n = 1 then
|
|
||||||
fmt1^^""
|
|
||||||
else
|
|
||||||
fmt2^^""
|
|
||||||
|
|
||||||
|
|
||||||
let init =
|
|
||||||
[]
|
|
||||||
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
module OASISExpr = struct
|
|
||||||
(* # 22 "src/oasis/OASISExpr.ml" *)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
open OASISGettext
|
|
||||||
|
|
||||||
|
|
||||||
type test = string
|
|
||||||
|
|
||||||
|
|
||||||
type flag = string
|
|
||||||
|
|
||||||
|
|
||||||
type t =
|
|
||||||
| EBool of bool
|
|
||||||
| ENot of t
|
|
||||||
| EAnd of t * t
|
|
||||||
| EOr of t * t
|
|
||||||
| EFlag of flag
|
|
||||||
| ETest of test * string
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
type 'a choices = (t * 'a) list
|
|
||||||
|
|
||||||
|
|
||||||
let eval var_get t =
|
|
||||||
let rec eval' =
|
|
||||||
function
|
|
||||||
| EBool b ->
|
|
||||||
b
|
|
||||||
|
|
||||||
| ENot e ->
|
|
||||||
not (eval' e)
|
|
||||||
|
|
||||||
| EAnd (e1, e2) ->
|
|
||||||
(eval' e1) && (eval' e2)
|
|
||||||
|
|
||||||
| EOr (e1, e2) ->
|
|
||||||
(eval' e1) || (eval' e2)
|
|
||||||
|
|
||||||
| EFlag nm ->
|
|
||||||
let v =
|
|
||||||
var_get nm
|
|
||||||
in
|
|
||||||
assert(v = "true" || v = "false");
|
|
||||||
(v = "true")
|
|
||||||
|
|
||||||
| ETest (nm, vl) ->
|
|
||||||
let v =
|
|
||||||
var_get nm
|
|
||||||
in
|
|
||||||
(v = vl)
|
|
||||||
in
|
|
||||||
eval' t
|
|
||||||
|
|
||||||
|
|
||||||
let choose ?printer ?name var_get lst =
|
|
||||||
let rec choose_aux =
|
|
||||||
function
|
|
||||||
| (cond, vl) :: tl ->
|
|
||||||
if eval var_get cond then
|
|
||||||
vl
|
|
||||||
else
|
|
||||||
choose_aux tl
|
|
||||||
| [] ->
|
|
||||||
let str_lst =
|
|
||||||
if lst = [] then
|
|
||||||
s_ "<empty>"
|
|
||||||
else
|
|
||||||
String.concat
|
|
||||||
(s_ ", ")
|
|
||||||
(List.map
|
|
||||||
(fun (cond, vl) ->
|
|
||||||
match printer with
|
|
||||||
| Some p -> p vl
|
|
||||||
| None -> s_ "<no printer>")
|
|
||||||
lst)
|
|
||||||
in
|
|
||||||
match name with
|
|
||||||
| Some nm ->
|
|
||||||
failwith
|
|
||||||
(Printf.sprintf
|
|
||||||
(f_ "No result for the choice list '%s': %s")
|
|
||||||
nm str_lst)
|
|
||||||
| None ->
|
|
||||||
failwith
|
|
||||||
(Printf.sprintf
|
|
||||||
(f_ "No result for a choice list: %s")
|
|
||||||
str_lst)
|
|
||||||
in
|
|
||||||
choose_aux (List.rev lst)
|
|
||||||
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
# 132 "myocamlbuild.ml"
|
|
||||||
module BaseEnvLight = struct
|
|
||||||
(* # 22 "src/base/BaseEnvLight.ml" *)
|
|
||||||
|
|
||||||
|
|
||||||
module MapString = Map.Make(String)
|
|
||||||
|
|
||||||
|
|
||||||
type t = string MapString.t
|
|
||||||
|
|
||||||
|
|
||||||
let default_filename =
|
|
||||||
Filename.concat
|
|
||||||
(Sys.getcwd ())
|
|
||||||
"setup.data"
|
|
||||||
|
|
||||||
|
|
||||||
let load ?(allow_empty=false) ?(filename=default_filename) () =
|
|
||||||
if Sys.file_exists filename then
|
|
||||||
begin
|
|
||||||
let chn =
|
|
||||||
open_in_bin filename
|
|
||||||
in
|
|
||||||
let st =
|
|
||||||
Stream.of_channel chn
|
|
||||||
in
|
|
||||||
let line =
|
|
||||||
ref 1
|
|
||||||
in
|
|
||||||
let st_line =
|
|
||||||
Stream.from
|
|
||||||
(fun _ ->
|
|
||||||
try
|
|
||||||
match Stream.next st with
|
|
||||||
| '\n' -> incr line; Some '\n'
|
|
||||||
| c -> Some c
|
|
||||||
with Stream.Failure -> None)
|
|
||||||
in
|
|
||||||
let lexer =
|
|
||||||
Genlex.make_lexer ["="] st_line
|
|
||||||
in
|
|
||||||
let rec read_file mp =
|
|
||||||
match Stream.npeek 3 lexer with
|
|
||||||
| [Genlex.Ident nm; Genlex.Kwd "="; Genlex.String value] ->
|
|
||||||
Stream.junk lexer;
|
|
||||||
Stream.junk lexer;
|
|
||||||
Stream.junk lexer;
|
|
||||||
read_file (MapString.add nm value mp)
|
|
||||||
| [] ->
|
|
||||||
mp
|
|
||||||
| _ ->
|
|
||||||
failwith
|
|
||||||
(Printf.sprintf
|
|
||||||
"Malformed data file '%s' line %d"
|
|
||||||
filename !line)
|
|
||||||
in
|
|
||||||
let mp =
|
|
||||||
read_file MapString.empty
|
|
||||||
in
|
|
||||||
close_in chn;
|
|
||||||
mp
|
|
||||||
end
|
|
||||||
else if allow_empty then
|
|
||||||
begin
|
|
||||||
MapString.empty
|
|
||||||
end
|
|
||||||
else
|
|
||||||
begin
|
|
||||||
failwith
|
|
||||||
(Printf.sprintf
|
|
||||||
"Unable to load environment, the file '%s' doesn't exist."
|
|
||||||
filename)
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
let rec var_expand str env =
|
|
||||||
let buff =
|
|
||||||
Buffer.create ((String.length str) * 2)
|
|
||||||
in
|
|
||||||
Buffer.add_substitute
|
|
||||||
buff
|
|
||||||
(fun var ->
|
|
||||||
try
|
|
||||||
var_expand (MapString.find var env) env
|
|
||||||
with Not_found ->
|
|
||||||
failwith
|
|
||||||
(Printf.sprintf
|
|
||||||
"No variable %s defined when trying to expand %S."
|
|
||||||
var
|
|
||||||
str))
|
|
||||||
str;
|
|
||||||
Buffer.contents buff
|
|
||||||
|
|
||||||
|
|
||||||
let var_get name env =
|
|
||||||
var_expand (MapString.find name env) env
|
|
||||||
|
|
||||||
|
|
||||||
let var_choose lst env =
|
|
||||||
OASISExpr.choose
|
|
||||||
(fun nm -> var_get nm env)
|
|
||||||
lst
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
# 237 "myocamlbuild.ml"
|
|
||||||
module MyOCamlbuildFindlib = struct
|
|
||||||
(* # 22 "src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
|
|
||||||
|
|
||||||
|
|
||||||
(** OCamlbuild extension, copied from
|
|
||||||
* http://brion.inria.fr/gallium/index.php/Using_ocamlfind_with_ocamlbuild
|
|
||||||
* by N. Pouillard and others
|
|
||||||
*
|
|
||||||
* Updated on 2009/02/28
|
|
||||||
*
|
|
||||||
* Modified by Sylvain Le Gall
|
|
||||||
*)
|
|
||||||
open Ocamlbuild_plugin
|
|
||||||
|
|
||||||
|
|
||||||
(* these functions are not really officially exported *)
|
|
||||||
let run_and_read =
|
|
||||||
Ocamlbuild_pack.My_unix.run_and_read
|
|
||||||
|
|
||||||
|
|
||||||
let blank_sep_strings =
|
|
||||||
Ocamlbuild_pack.Lexers.blank_sep_strings
|
|
||||||
|
|
||||||
|
|
||||||
let exec_from_conf exec =
|
|
||||||
let exec =
|
|
||||||
let env_filename = Pathname.basename BaseEnvLight.default_filename in
|
|
||||||
let env = BaseEnvLight.load ~filename:env_filename ~allow_empty:true () in
|
|
||||||
try
|
|
||||||
BaseEnvLight.var_get exec env
|
|
||||||
with Not_found ->
|
|
||||||
Printf.eprintf "W: Cannot get variable %s\n" exec;
|
|
||||||
exec
|
|
||||||
in
|
|
||||||
let fix_win32 str =
|
|
||||||
if Sys.os_type = "Win32" then begin
|
|
||||||
let buff = Buffer.create (String.length str) in
|
|
||||||
(* Adapt for windowsi, ocamlbuild + win32 has a hard time to handle '\\'.
|
|
||||||
*)
|
|
||||||
String.iter
|
|
||||||
(fun c -> Buffer.add_char buff (if c = '\\' then '/' else c))
|
|
||||||
str;
|
|
||||||
Buffer.contents buff
|
|
||||||
end else begin
|
|
||||||
str
|
|
||||||
end
|
|
||||||
in
|
|
||||||
fix_win32 exec
|
|
||||||
|
|
||||||
let split s ch =
|
|
||||||
let buf = Buffer.create 13 in
|
|
||||||
let x = ref [] in
|
|
||||||
let flush () =
|
|
||||||
x := (Buffer.contents buf) :: !x;
|
|
||||||
Buffer.clear buf
|
|
||||||
in
|
|
||||||
String.iter
|
|
||||||
(fun c ->
|
|
||||||
if c = ch then
|
|
||||||
flush ()
|
|
||||||
else
|
|
||||||
Buffer.add_char buf c)
|
|
||||||
s;
|
|
||||||
flush ();
|
|
||||||
List.rev !x
|
|
||||||
|
|
||||||
|
|
||||||
let split_nl s = split s '\n'
|
|
||||||
|
|
||||||
|
|
||||||
let before_space s =
|
|
||||||
try
|
|
||||||
String.before s (String.index s ' ')
|
|
||||||
with Not_found -> s
|
|
||||||
|
|
||||||
(* ocamlfind command *)
|
|
||||||
let ocamlfind x = S[Sh (exec_from_conf "ocamlfind"); x]
|
|
||||||
|
|
||||||
(* This lists all supported packages. *)
|
|
||||||
let find_packages () =
|
|
||||||
List.map before_space (split_nl & run_and_read "ocamlfind list")
|
|
||||||
|
|
||||||
|
|
||||||
(* Mock to list available syntaxes. *)
|
|
||||||
let find_syntaxes () = ["camlp4o"; "camlp4r"]
|
|
||||||
|
|
||||||
|
|
||||||
let well_known_syntax = [
|
|
||||||
"camlp4.quotations.o";
|
|
||||||
"camlp4.quotations.r";
|
|
||||||
"camlp4.exceptiontracer";
|
|
||||||
"camlp4.extend";
|
|
||||||
"camlp4.foldgenerator";
|
|
||||||
"camlp4.listcomprehension";
|
|
||||||
"camlp4.locationstripper";
|
|
||||||
"camlp4.macro";
|
|
||||||
"camlp4.mapgenerator";
|
|
||||||
"camlp4.metagenerator";
|
|
||||||
"camlp4.profiler";
|
|
||||||
"camlp4.tracer"
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
let dispatch =
|
|
||||||
function
|
|
||||||
| After_options ->
|
|
||||||
(* By using Before_options one let command line options have an higher
|
|
||||||
* priority on the contrary using After_options will guarantee to have
|
|
||||||
* the higher priority override default commands by ocamlfind ones *)
|
|
||||||
Options.ocamlc := ocamlfind & A"ocamlc";
|
|
||||||
Options.ocamlopt := ocamlfind & A"ocamlopt";
|
|
||||||
Options.ocamldep := ocamlfind & A"ocamldep";
|
|
||||||
Options.ocamldoc := ocamlfind & A"ocamldoc";
|
|
||||||
Options.ocamlmktop := ocamlfind & A"ocamlmktop";
|
|
||||||
Options.ocamlmklib := ocamlfind & A"ocamlmklib"
|
|
||||||
|
|
||||||
| After_rules ->
|
|
||||||
|
|
||||||
(* When one link an OCaml library/binary/package, one should use
|
|
||||||
* -linkpkg *)
|
|
||||||
flag ["ocaml"; "link"; "program"] & A"-linkpkg";
|
|
||||||
|
|
||||||
(* For each ocamlfind package one inject the -package option when
|
|
||||||
* compiling, computing dependencies, generating documentation and
|
|
||||||
* linking. *)
|
|
||||||
List.iter
|
|
||||||
begin fun pkg ->
|
|
||||||
let base_args = [A"-package"; A pkg] in
|
|
||||||
(* TODO: consider how to really choose camlp4o or camlp4r. *)
|
|
||||||
let syn_args = [A"-syntax"; A "camlp4o"] in
|
|
||||||
let args =
|
|
||||||
(* Heuristic to identify syntax extensions: whether they end in
|
|
||||||
".syntax"; some might not.
|
|
||||||
*)
|
|
||||||
if Filename.check_suffix pkg "syntax" ||
|
|
||||||
List.mem pkg well_known_syntax then
|
|
||||||
syn_args @ base_args
|
|
||||||
else
|
|
||||||
base_args
|
|
||||||
in
|
|
||||||
flag ["ocaml"; "compile"; "pkg_"^pkg] & S args;
|
|
||||||
flag ["ocaml"; "ocamldep"; "pkg_"^pkg] & S args;
|
|
||||||
flag ["ocaml"; "doc"; "pkg_"^pkg] & S args;
|
|
||||||
flag ["ocaml"; "link"; "pkg_"^pkg] & S base_args;
|
|
||||||
flag ["ocaml"; "infer_interface"; "pkg_"^pkg] & S args;
|
|
||||||
end
|
|
||||||
(find_packages ());
|
|
||||||
|
|
||||||
(* Like -package but for extensions syntax. Morover -syntax is useless
|
|
||||||
* when linking. *)
|
|
||||||
List.iter begin fun syntax ->
|
|
||||||
flag ["ocaml"; "compile"; "syntax_"^syntax] & S[A"-syntax"; A syntax];
|
|
||||||
flag ["ocaml"; "ocamldep"; "syntax_"^syntax] & S[A"-syntax"; A syntax];
|
|
||||||
flag ["ocaml"; "doc"; "syntax_"^syntax] & S[A"-syntax"; A syntax];
|
|
||||||
flag ["ocaml"; "infer_interface"; "syntax_"^syntax] &
|
|
||||||
S[A"-syntax"; A syntax];
|
|
||||||
end (find_syntaxes ());
|
|
||||||
|
|
||||||
(* The default "thread" tag is not compatible with ocamlfind.
|
|
||||||
* Indeed, the default rules add the "threads.cma" or "threads.cmxa"
|
|
||||||
* options when using this tag. When using the "-linkpkg" option with
|
|
||||||
* ocamlfind, this module will then be added twice on the command line.
|
|
||||||
*
|
|
||||||
* To solve this, one approach is to add the "-thread" option when using
|
|
||||||
* the "threads" package using the previous plugin.
|
|
||||||
*)
|
|
||||||
flag ["ocaml"; "pkg_threads"; "compile"] (S[A "-thread"]);
|
|
||||||
flag ["ocaml"; "pkg_threads"; "doc"] (S[A "-I"; A "+threads"]);
|
|
||||||
flag ["ocaml"; "pkg_threads"; "link"] (S[A "-thread"]);
|
|
||||||
flag ["ocaml"; "pkg_threads"; "infer_interface"] (S[A "-thread"]);
|
|
||||||
flag ["ocaml"; "package(threads)"; "compile"] (S[A "-thread"]);
|
|
||||||
flag ["ocaml"; "package(threads)"; "doc"] (S[A "-I"; A "+threads"]);
|
|
||||||
flag ["ocaml"; "package(threads)"; "link"] (S[A "-thread"]);
|
|
||||||
flag ["ocaml"; "package(threads)"; "infer_interface"] (S[A "-thread"]);
|
|
||||||
|
|
||||||
| _ ->
|
|
||||||
()
|
|
||||||
end
|
|
||||||
|
|
||||||
module MyOCamlbuildBase = struct
|
|
||||||
(* # 22 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
|
|
||||||
|
|
||||||
|
|
||||||
(** Base functions for writing myocamlbuild.ml
|
|
||||||
@author Sylvain Le Gall
|
|
||||||
*)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
open Ocamlbuild_plugin
|
|
||||||
module OC = Ocamlbuild_pack.Ocaml_compiler
|
|
||||||
|
|
||||||
|
|
||||||
type dir = string
|
|
||||||
type file = string
|
|
||||||
type name = string
|
|
||||||
type tag = string
|
|
||||||
|
|
||||||
|
|
||||||
(* # 62 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
|
|
||||||
|
|
||||||
|
|
||||||
type t =
|
|
||||||
{
|
|
||||||
lib_ocaml: (name * dir list * string list) list;
|
|
||||||
lib_c: (name * dir * file list) list;
|
|
||||||
flags: (tag list * (spec OASISExpr.choices)) list;
|
|
||||||
(* Replace the 'dir: include' from _tags by a precise interdepends in
|
|
||||||
* directory.
|
|
||||||
*)
|
|
||||||
includes: (dir * dir list) list;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
let env_filename =
|
|
||||||
Pathname.basename
|
|
||||||
BaseEnvLight.default_filename
|
|
||||||
|
|
||||||
|
|
||||||
let dispatch_combine lst =
|
|
||||||
fun e ->
|
|
||||||
List.iter
|
|
||||||
(fun dispatch -> dispatch e)
|
|
||||||
lst
|
|
||||||
|
|
||||||
|
|
||||||
let tag_libstubs nm =
|
|
||||||
"use_lib"^nm^"_stubs"
|
|
||||||
|
|
||||||
|
|
||||||
let nm_libstubs nm =
|
|
||||||
nm^"_stubs"
|
|
||||||
|
|
||||||
|
|
||||||
let dispatch t e =
|
|
||||||
let env =
|
|
||||||
BaseEnvLight.load
|
|
||||||
~filename:env_filename
|
|
||||||
~allow_empty:true
|
|
||||||
()
|
|
||||||
in
|
|
||||||
match e with
|
|
||||||
| Before_options ->
|
|
||||||
let no_trailing_dot s =
|
|
||||||
if String.length s >= 1 && s.[0] = '.' then
|
|
||||||
String.sub s 1 ((String.length s) - 1)
|
|
||||||
else
|
|
||||||
s
|
|
||||||
in
|
|
||||||
List.iter
|
|
||||||
(fun (opt, var) ->
|
|
||||||
try
|
|
||||||
opt := no_trailing_dot (BaseEnvLight.var_get var env)
|
|
||||||
with Not_found ->
|
|
||||||
Printf.eprintf "W: Cannot get variable %s\n" var)
|
|
||||||
[
|
|
||||||
Options.ext_obj, "ext_obj";
|
|
||||||
Options.ext_lib, "ext_lib";
|
|
||||||
Options.ext_dll, "ext_dll";
|
|
||||||
]
|
|
||||||
|
|
||||||
| After_rules ->
|
|
||||||
(* Declare OCaml libraries *)
|
|
||||||
List.iter
|
|
||||||
(function
|
|
||||||
| nm, [], intf_modules ->
|
|
||||||
ocaml_lib nm;
|
|
||||||
let cmis =
|
|
||||||
List.map (fun m -> (String.uncapitalize m) ^ ".cmi")
|
|
||||||
intf_modules in
|
|
||||||
dep ["ocaml"; "link"; "library"; "file:"^nm^".cma"] cmis
|
|
||||||
| nm, dir :: tl, intf_modules ->
|
|
||||||
ocaml_lib ~dir:dir (dir^"/"^nm);
|
|
||||||
List.iter
|
|
||||||
(fun dir ->
|
|
||||||
List.iter
|
|
||||||
(fun str ->
|
|
||||||
flag ["ocaml"; "use_"^nm; str] (S[A"-I"; P dir]))
|
|
||||||
["compile"; "infer_interface"; "doc"])
|
|
||||||
tl;
|
|
||||||
let cmis =
|
|
||||||
List.map (fun m -> dir^"/"^(String.uncapitalize m)^".cmi")
|
|
||||||
intf_modules in
|
|
||||||
dep ["ocaml"; "link"; "library"; "file:"^dir^"/"^nm^".cma"]
|
|
||||||
cmis)
|
|
||||||
t.lib_ocaml;
|
|
||||||
|
|
||||||
(* Declare directories dependencies, replace "include" in _tags. *)
|
|
||||||
List.iter
|
|
||||||
(fun (dir, include_dirs) ->
|
|
||||||
Pathname.define_context dir include_dirs)
|
|
||||||
t.includes;
|
|
||||||
|
|
||||||
(* Declare C libraries *)
|
|
||||||
List.iter
|
|
||||||
(fun (lib, dir, headers) ->
|
|
||||||
(* Handle C part of library *)
|
|
||||||
flag ["link"; "library"; "ocaml"; "byte"; tag_libstubs lib]
|
|
||||||
(S[A"-dllib"; A("-l"^(nm_libstubs lib)); A"-cclib";
|
|
||||||
A("-l"^(nm_libstubs lib))]);
|
|
||||||
|
|
||||||
flag ["link"; "library"; "ocaml"; "native"; tag_libstubs lib]
|
|
||||||
(S[A"-cclib"; A("-l"^(nm_libstubs lib))]);
|
|
||||||
|
|
||||||
flag ["link"; "program"; "ocaml"; "byte"; tag_libstubs lib]
|
|
||||||
(S[A"-dllib"; A("dll"^(nm_libstubs lib))]);
|
|
||||||
|
|
||||||
(* When ocaml link something that use the C library, then one
|
|
||||||
need that file to be up to date.
|
|
||||||
*)
|
|
||||||
dep ["link"; "ocaml"; "program"; tag_libstubs lib]
|
|
||||||
[dir/"lib"^(nm_libstubs lib)^"."^(!Options.ext_lib)];
|
|
||||||
|
|
||||||
dep ["compile"; "ocaml"; "program"; tag_libstubs lib]
|
|
||||||
[dir/"lib"^(nm_libstubs lib)^"."^(!Options.ext_lib)];
|
|
||||||
|
|
||||||
(* TODO: be more specific about what depends on headers *)
|
|
||||||
(* Depends on .h files *)
|
|
||||||
dep ["compile"; "c"]
|
|
||||||
headers;
|
|
||||||
|
|
||||||
(* Setup search path for lib *)
|
|
||||||
flag ["link"; "ocaml"; "use_"^lib]
|
|
||||||
(S[A"-I"; P(dir)]);
|
|
||||||
)
|
|
||||||
t.lib_c;
|
|
||||||
|
|
||||||
(* Add flags *)
|
|
||||||
List.iter
|
|
||||||
(fun (tags, cond_specs) ->
|
|
||||||
let spec = BaseEnvLight.var_choose cond_specs env in
|
|
||||||
let rec eval_specs =
|
|
||||||
function
|
|
||||||
| S lst -> S (List.map eval_specs lst)
|
|
||||||
| A str -> A (BaseEnvLight.var_expand str env)
|
|
||||||
| spec -> spec
|
|
||||||
in
|
|
||||||
flag tags & (eval_specs spec))
|
|
||||||
t.flags
|
|
||||||
| _ ->
|
|
||||||
()
|
|
||||||
|
|
||||||
|
|
||||||
let dispatch_default t =
|
|
||||||
dispatch_combine
|
|
||||||
[
|
|
||||||
dispatch t;
|
|
||||||
MyOCamlbuildFindlib.dispatch;
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
# 594 "myocamlbuild.ml"
|
|
||||||
open Ocamlbuild_plugin;;
|
|
||||||
let package_default =
|
|
||||||
{
|
|
||||||
MyOCamlbuildBase.lib_ocaml = [("sequence", [], [])];
|
|
||||||
lib_c = [];
|
|
||||||
flags = [];
|
|
||||||
includes = []
|
|
||||||
}
|
|
||||||
;;
|
|
||||||
|
|
||||||
let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
|
|
||||||
|
|
||||||
# 608 "myocamlbuild.ml"
|
|
||||||
(* OASIS_STOP *)
|
|
||||||
Ocamlbuild_plugin.dispatch dispatch_default;;
|
|
||||||
15
qtest/Makefile
Normal file
15
qtest/Makefile
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
|
||||||
|
QTEST_PREAMBLE=''
|
||||||
|
DONTTEST=../src/sequenceLabels.ml
|
||||||
|
QTESTABLE=$(filter-out $(DONTTEST), \
|
||||||
|
$(wildcard ../src/*.ml) \
|
||||||
|
$(wildcard ../src/*.mli) \
|
||||||
|
)
|
||||||
|
|
||||||
|
qtest-gen:
|
||||||
|
@if which qtest > /dev/null ; then \
|
||||||
|
qtest extract --preamble $(QTEST_PREAMBLE) \
|
||||||
|
-o run_qtest.ml \
|
||||||
|
$(QTESTABLE) 2> /dev/null ; \
|
||||||
|
else touch qtest/run_qtest.ml ; \
|
||||||
|
fi
|
||||||
21
qtest/jbuild
Normal file
21
qtest/jbuild
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
|
||||||
|
(rule
|
||||||
|
((targets (run_qtest.ml))
|
||||||
|
(deps ((file Makefile)))
|
||||||
|
(fallback)
|
||||||
|
;(libraries (qtest qcheck))
|
||||||
|
(action
|
||||||
|
(run make qtest-gen))
|
||||||
|
))
|
||||||
|
|
||||||
|
(executable
|
||||||
|
((name run_qtest)
|
||||||
|
(libraries (sequence qcheck))
|
||||||
|
))
|
||||||
|
|
||||||
|
(alias
|
||||||
|
((name runtest)
|
||||||
|
(deps (run_qtest.exe))
|
||||||
|
(action (run ${<}))
|
||||||
|
))
|
||||||
|
|
||||||
|
|
@ -5,22 +5,15 @@ author: "Simon Cruanes"
|
||||||
maintainer: "simon.cruanes.2007@m4x.org"
|
maintainer: "simon.cruanes.2007@m4x.org"
|
||||||
license: "BSD-2-clauses"
|
license: "BSD-2-clauses"
|
||||||
build: [
|
build: [
|
||||||
["./configure" "--disable-docs"
|
|
||||||
"--%{delimcc:enable}%-invert"
|
|
||||||
"--%{base-bigarray:enable}%-bigarray"
|
|
||||||
"--prefix" "%{prefix}%"
|
|
||||||
]
|
|
||||||
[make "build"]
|
[make "build"]
|
||||||
]
|
]
|
||||||
|
install: ["jbuilder" "install"]
|
||||||
build-doc: [
|
build-doc: [
|
||||||
["./configure" "--enable-docs"]
|
|
||||||
[make "doc"]
|
[make "doc"]
|
||||||
]
|
]
|
||||||
build-test: [
|
build-test: [
|
||||||
["./configure" "--enable-tests"]
|
|
||||||
[make "test"]
|
[make "test"]
|
||||||
]
|
]
|
||||||
install: [make "install"]
|
|
||||||
remove: [
|
remove: [
|
||||||
["ocamlfind" "remove" "sequence"]
|
["ocamlfind" "remove" "sequence"]
|
||||||
]
|
]
|
||||||
|
|
@ -28,13 +21,17 @@ depends: [
|
||||||
"ocamlfind"
|
"ocamlfind"
|
||||||
"base-bytes"
|
"base-bytes"
|
||||||
"result"
|
"result"
|
||||||
"ocamlbuild" {build}
|
"jbuilder" {build}
|
||||||
"qcheck" {test}
|
"qcheck" {test}
|
||||||
"qtest" {test}
|
"qtest" {test}
|
||||||
|
"ocaml-version" { >= "4.02" }
|
||||||
]
|
]
|
||||||
tags: [ "sequence" "iterator" "iter" "fold" ]
|
tags: [ "sequence" "iterator" "iter" "fold" ]
|
||||||
homepage: "https://github.com/c-cube/sequence/"
|
homepage: "https://github.com/c-cube/sequence/"
|
||||||
depopts: ["delimcc" "base-bigarray"]
|
depopts: [
|
||||||
|
"delimcc"
|
||||||
|
"base-bigarray"
|
||||||
|
]
|
||||||
doc: "http://cedeela.fr/~simon/software/sequence/Sequence.html"
|
doc: "http://cedeela.fr/~simon/software/sequence/Sequence.html"
|
||||||
bug-reports: "https://github.com/c-cube/sequence/issues"
|
bug-reports: "https://github.com/c-cube/sequence/issues"
|
||||||
dev-repo: "https://github.com/c-cube/sequence.git"
|
dev-repo: "https://github.com/c-cube/sequence.git"
|
||||||
37
setup.ml
37
setup.ml
|
|
@ -1,37 +0,0 @@
|
||||||
(* setup.ml generated for the first time by OASIS v0.4.4 *)
|
|
||||||
|
|
||||||
(* OASIS_START *)
|
|
||||||
(* DO NOT EDIT (digest: 9852805d5c19ca1cb6abefde2dcea323) *)
|
|
||||||
(******************************************************************************)
|
|
||||||
(* OASIS: architecture for building OCaml libraries and applications *)
|
|
||||||
(* *)
|
|
||||||
(* Copyright (C) 2011-2013, Sylvain Le Gall *)
|
|
||||||
(* Copyright (C) 2008-2011, OCamlCore SARL *)
|
|
||||||
(* *)
|
|
||||||
(* This library is free software; you can redistribute it and/or modify it *)
|
|
||||||
(* under the terms of the GNU Lesser General Public License as published by *)
|
|
||||||
(* the Free Software Foundation; either version 2.1 of the License, or (at *)
|
|
||||||
(* your option) any later version, with the OCaml static compilation *)
|
|
||||||
(* exception. *)
|
|
||||||
(* *)
|
|
||||||
(* This library is distributed in the hope that it will be useful, but *)
|
|
||||||
(* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *)
|
|
||||||
(* or FITNESS FOR A PARTICULAR PURPOSE. See the file COPYING for more *)
|
|
||||||
(* details. *)
|
|
||||||
(* *)
|
|
||||||
(* You should have received a copy of the GNU Lesser General Public License *)
|
|
||||||
(* along with this library; if not, write to the Free Software Foundation, *)
|
|
||||||
(* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *)
|
|
||||||
(******************************************************************************)
|
|
||||||
|
|
||||||
let () =
|
|
||||||
try
|
|
||||||
Topdirs.dir_directory (Sys.getenv "OCAML_TOPLEVEL_PATH")
|
|
||||||
with Not_found -> ()
|
|
||||||
;;
|
|
||||||
#use "topfind";;
|
|
||||||
#require "oasis.dynrun";;
|
|
||||||
open OASISDynRun;;
|
|
||||||
|
|
||||||
(* OASIS_STOP *)
|
|
||||||
let () = setup ();;
|
|
||||||
11
src/bigarray/jbuild
Normal file
11
src/bigarray/jbuild
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
|
||||||
|
(library
|
||||||
|
((name sequence_bigarray)
|
||||||
|
(public_name sequence.bigarray)
|
||||||
|
(libraries (sequence bigarray))
|
||||||
|
(wrapped false)
|
||||||
|
(optional)
|
||||||
|
(flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -w -33 -safe-string -color always))
|
||||||
|
(ocamlopt_flags (:standard -O3 -color always
|
||||||
|
-unbox-closures -unbox-closures-factor 20))
|
||||||
|
))
|
||||||
12
src/invert/jbuild
Normal file
12
src/invert/jbuild
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
|
||||||
|
(library
|
||||||
|
((name sequence_invert)
|
||||||
|
(public_name sequence.invert)
|
||||||
|
(libraries (sequence delimcc))
|
||||||
|
(optional)
|
||||||
|
(wrapped false)
|
||||||
|
(flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -color always))
|
||||||
|
(ocamlopt_flags (:standard -O3 -color always
|
||||||
|
-unbox-closures -unbox-closures-factor 20))
|
||||||
|
))
|
||||||
|
|
||||||
11
src/jbuild
Normal file
11
src/jbuild
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
|
||||||
|
(library
|
||||||
|
((name sequence)
|
||||||
|
(public_name sequence)
|
||||||
|
(wrapped false)
|
||||||
|
(flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -color always -nolabels))
|
||||||
|
(ocamlopt_flags (:standard -O3 -color always
|
||||||
|
-unbox-closures -unbox-closures-factor 20))
|
||||||
|
(libraries (bytes result))
|
||||||
|
))
|
||||||
|
|
||||||
Loading…
Add table
Reference in a new issue