From b7a250cef2d02e49f4a416d2953595cc337c1b11 Mon Sep 17 00:00:00 2001
From: Simon Cruanes <simon.cruanes.2007@m4x.org>
Date: Sun, 24 Dec 2017 16:49:47 +0100
Subject: [PATCH] remove cppo from deps and build

---
 doc/intro.txt   |  3 +--
 myocamlbuild.ml | 34 ----------------------------------
 opam            |  1 -
 3 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/doc/intro.txt b/doc/intro.txt
index 43c894e2..8800a6ab 100644
--- a/doc/intro.txt
+++ b/doc/intro.txt
@@ -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
 structures comprise (some modules in misc/, some other in core/):
 
-the core library, containers, now depends on
-{{:https://github.com/mjambon/cppo}cppo} and base-bytes (provided
+the core library, containers, now depends on base-bytes (provided
 by ocamlfind).
 
 {4 Core Modules (extension of the standard library)}
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index b80ef8d1..a877d14d 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -680,40 +680,6 @@ dispatch
   (MyOCamlbuildBase.dispatch_combine [
     begin function
     | 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 *)
       dep ["ocaml"; "doc"; "extension:html"] & [doc_intro] ;
diff --git a/opam b/opam
index 3601a755..a82de59b 100644
--- a/opam
+++ b/opam
@@ -26,7 +26,6 @@ depends: [
   "oasis" {build}
   "base-bytes"
   "result"
-  "cppo" {build}
   "ocamlbuild" {build}
 ]
 depopts: [