mirror of
https://github.com/c-cube/ocaml-containers.git
synced 2026-01-28 11:54:51 -05:00
remove cppo from deps and build
This commit is contained in:
parent
df07cf5bb2
commit
b7a250cef2
3 changed files with 1 additions and 37 deletions
|
|
@ -16,8 +16,7 @@ CC-SA3 {{:http://en.wikipedia.org/wiki/File:Hypercube.svg} wikimedia}
|
||||||
The design is mostly centered around polymorphism rather than functors. Such
|
The design is mostly centered around polymorphism rather than functors. Such
|
||||||
structures comprise (some modules in misc/, some other in core/):
|
structures comprise (some modules in misc/, some other in core/):
|
||||||
|
|
||||||
the core library, containers, now depends on
|
the core library, containers, now depends on base-bytes (provided
|
||||||
{{:https://github.com/mjambon/cppo}cppo} and base-bytes (provided
|
|
||||||
by ocamlfind).
|
by ocamlfind).
|
||||||
|
|
||||||
{4 Core Modules (extension of the standard library)}
|
{4 Core Modules (extension of the standard library)}
|
||||||
|
|
|
||||||
|
|
@ -680,40 +680,6 @@ dispatch
|
||||||
(MyOCamlbuildBase.dispatch_combine [
|
(MyOCamlbuildBase.dispatch_combine [
|
||||||
begin function
|
begin function
|
||||||
| After_rules ->
|
| After_rules ->
|
||||||
(* replace with Ocamlbuild_cppo.dispatch when 4.00 is not supported
|
|
||||||
anymore *)
|
|
||||||
let dep_cppo = "%(name).cppo.ml" in
|
|
||||||
let prod1 = "%(name: <*> and not <*.cppo>).ml" in
|
|
||||||
let prod2 = "%(name: <**/*> and not <**/*.cppo>).ml" in
|
|
||||||
let f prod env _build =
|
|
||||||
let dep = env dep_cppo in
|
|
||||||
let prod = env prod in
|
|
||||||
let tags = tags_of_pathname prod ++ "cppo" in
|
|
||||||
Cmd (S[A "cppo"; T tags; S [A "-o"; P prod]; P dep ])
|
|
||||||
in
|
|
||||||
rule "cppo1" ~dep:dep_cppo ~prod:prod1 (f prod1) ;
|
|
||||||
rule "cppo2" ~dep:dep_cppo ~prod:prod2 (f prod2) ;
|
|
||||||
pflag ["cppo"] "cppo_D" (fun s -> S [A "-D"; A s]) ;
|
|
||||||
pflag ["cppo"] "cppo_U" (fun s -> S [A "-U"; A s]) ;
|
|
||||||
pflag ["cppo"] "cppo_I" (fun s ->
|
|
||||||
if Pathname.is_directory s then S [A "-I"; P s]
|
|
||||||
else S [A "-I"; P (Pathname.dirname s)]
|
|
||||||
) ;
|
|
||||||
pdep ["cppo"] "cppo_I" (fun s ->
|
|
||||||
if Pathname.is_directory s then [] else [s]) ;
|
|
||||||
flag ["cppo"; "cppo_q"] (A "-q") ;
|
|
||||||
flag ["cppo"; "cppo_s"] (A "-s") ;
|
|
||||||
flag ["cppo"; "cppo_n"] (A "-n") ;
|
|
||||||
pflag ["cppo"] "cppo_x" (fun s -> S [A "-x"; A s]);
|
|
||||||
(* end replace *)
|
|
||||||
|
|
||||||
let major, minor = Scanf.sscanf Sys.ocaml_version "%d.%d.%d"
|
|
||||||
(fun major minor patchlevel -> major, minor)
|
|
||||||
in
|
|
||||||
let ocaml_major = "OCAML_MAJOR " ^ string_of_int major in
|
|
||||||
let ocaml_minor = "OCAML_MINOR " ^ string_of_int minor in
|
|
||||||
|
|
||||||
flag ["cppo"] & S[A"-D"; A ocaml_major; A"-D"; A ocaml_minor] ;
|
|
||||||
|
|
||||||
(* Documentation index *)
|
(* Documentation index *)
|
||||||
dep ["ocaml"; "doc"; "extension:html"] & [doc_intro] ;
|
dep ["ocaml"; "doc"; "extension:html"] & [doc_intro] ;
|
||||||
|
|
|
||||||
1
opam
1
opam
|
|
@ -26,7 +26,6 @@ depends: [
|
||||||
"oasis" {build}
|
"oasis" {build}
|
||||||
"base-bytes"
|
"base-bytes"
|
||||||
"result"
|
"result"
|
||||||
"cppo" {build}
|
|
||||||
"ocamlbuild" {build}
|
"ocamlbuild" {build}
|
||||||
]
|
]
|
||||||
depopts: [
|
depopts: [
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue