Merge pull request #8 from xapi-project/ppx-ely

Merge pp-ely into master for moving to OCaml 4.02.3 and PPX

Author: lindig

_oasis

@@ -11,7 +11,7 @@ Plugins:      DevFiles (0.3), META (0.3)
 Library "xapi-backtrace"
   Path: lib
   Modules: Backtrace
-  BuildDepends: threads, sexplib, sexplib.syntax, rpclib, rpclib.syntax
+  BuildDepends: threads, sexplib, ppx_sexp_conv, rpclib, rpclib.json, ppx_deriving_rpc
 
 Document backtrace
   Type:                 ocamlbuild (0.4)

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: f9eb71a5c12c76bebad5dfc57456d180)
+# DO NOT EDIT (digest: a59c8ddb1cfe724d9a82aeebe131891d)
 # 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
@@ -16,9 +16,10 @@ true: annot, bin_annot
 "_darcs": not_hygienic
 # Library xapi-backtrace
 "lib/xapi-backtrace.cmxs": use_xapi-backtrace
+<lib/*.ml{,i,y}>: pkg_ppx_deriving_rpc
+<lib/*.ml{,i,y}>: pkg_ppx_sexp_conv
 <lib/*.ml{,i,y}>: pkg_rpclib
-<lib/*.ml{,i,y}>: pkg_rpclib.syntax
+<lib/*.ml{,i,y}>: pkg_rpclib.json
 <lib/*.ml{,i,y}>: pkg_sexplib
-<lib/*.ml{,i,y}>: pkg_sexplib.syntax
 <lib/*.ml{,i,y}>: pkg_threads
 # OASIS_STOP

lib/META

@@ -1,8 +1,9 @@
 # OASIS_START
-# DO NOT EDIT (digest: e0e2adcd87cbfc650e00fb9595e79124)
+# DO NOT EDIT (digest: 490bf2d2804a63bdd597621c29a85b5b)
 version = "0.3"
 description = "Helper functions for processing backtraces"
-requires = "threads sexplib sexplib.syntax rpclib rpclib.syntax"
+requires =
+"threads sexplib ppx_sexp_conv rpclib rpclib.json ppx_deriving_rpc"
 archive(byte) = "xapi-backtrace.cma"
 archive(byte, plugin) = "xapi-backtrace.cma"
 archive(native) = "xapi-backtrace.cmxa"

lib/backtrace.ml

@@ -36,9 +36,9 @@ type frame = {
   process: string;
   filename: string;
   line: int;
-} with sexp
+} [@@deriving sexp]
 
-type t = frame list with sexp
+type t = frame list [@@deriving sexp]
 
 let empty = []
 
@@ -216,7 +216,7 @@ module Interop = struct
     (* Python json.dumps and rpclib are not very friendly *)
     files: string list;
     lines: int list;
-  } with rpc
+  } [@@deriving rpc]
 
   let of_json source_name txt =
       txt

lib/backtrace.mli

@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *)
 
-type t with sexp
+type t [@@deriving sexp]
 (** A backtrace from a particular thread. *)
 
 val empty: t