Merge pull request mirage#16 from samoht/master

Remove camlp4 dependency
samoht · Jun 12, 2015 · 55c1283 · 55c1283
2 parents 3d54307 + 1c41d0d
commit 55c1283
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/_oasis b/_oasis
@@ -12,5 +12,4 @@ Library "mirage-http"
   Path:               lib
   Findlibname:        mirage-http
   Modules:            Cohttp_mirage, Cohttp_mirage_io
-  BuildDepends:       cohttp.lwt-core, tcpip.channel, conduit.mirage, sexplib.syntax
-  XMETARequires:      cohttp.lwt-core, tcpip.channel, lwt, conduit.mirage, sexplib
+  BuildDepends:       cohttp.lwt-core, tcpip.channel, conduit.mirage, sexplib
diff --git a/_tags b/_tags
@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: c99ec3268548ab3194e3e2947e8caea1)
+# DO NOT EDIT (digest: b09e7788abd04ff75b51f50cfabc78f5)
 # 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
@@ -18,7 +18,7 @@ true: annot, bin_annot
 "lib/mirage-http.cmxs": use_mirage-http
 <lib/*.ml{,i,y}>: pkg_cohttp.lwt-core
 <lib/*.ml{,i,y}>: pkg_conduit.mirage
-<lib/*.ml{,i,y}>: pkg_sexplib.syntax
+<lib/*.ml{,i,y}>: pkg_sexplib
 <lib/*.ml{,i,y}>: pkg_tcpip.channel
 # OASIS_STOP
 true: annot, bin_annot, debug, principal
diff --git a/lib/META b/lib/META
@@ -1,8 +1,8 @@
 # OASIS_START
-# DO NOT EDIT (digest: 149a3cc9eb16e5d81c3dc3ea7259bf98)
+# DO NOT EDIT (digest: fe7064f0958b0551b042d926a7e1ee38)
 version = "2.4.0"
 description = "Mirage HTTP clent and server for Unix"
-requires = "cohttp.lwt-core tcpip.channel lwt conduit.mirage sexplib"
+requires = "cohttp.lwt-core tcpip.channel conduit.mirage sexplib"
 archive(byte) = "mirage-http.cma"
 archive(byte, plugin) = "mirage-http.cma"
 archive(native) = "mirage-http.cmxa"

diff --git a/opam b/opam
@@ -14,7 +14,6 @@ depends: [
   "mirage-conduit" {>= "2.2.0"}
   "lwt" {>= "2.4.3"}
   "cohttp" {>= "0.18.0"}
-  "camlp4"
   "sexplib"
 ]
 available: [ocaml-version >= "4.00.0"]
diff --git a/setup.ml b/setup.ml
@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.3.0 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 60f6d8a89ccd3b2f4c863a46f86c4afa) *)
+(* DO NOT EDIT (digest: bc7a368694b35af9f645fa68866f89c8) *)
 (*
    Regenerated by OASIS v0.4.5
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6742,7 +6742,7 @@ let setup_t =
                            FindlibPackage ("cohttp.lwt-core", None);
                            FindlibPackage ("tcpip.channel", None);
                            FindlibPackage ("conduit.mirage", None);
-                           FindlibPackage ("sexplib.syntax", None)
+                           FindlibPackage ("sexplib", None)
                         ];
                       bs_build_tools = [ExternalTool "ocamlbuild"];
                       bs_c_sources = [];
@@ -6770,7 +6770,7 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.5";
-     oasis_digest = Some "')!\144ðj¿¥\019(õ\\ã8á¡";
+     oasis_digest = Some "\158ô\"\027½\137\129\143ÍxûVÁ\0240L";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false