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

Merge ppx-ely into master for OCaml 4.02.3 and PPX

Author: mseri

_oasis

@@ -1,4 +1,4 @@
-OASISFormat: 0.2
+OASISFormat: 0.3
 Name:        xapi-storage-script
 Version:     0.12.0
 Synopsis:    Adapter which allows xapi to call storage scripts
@@ -13,4 +13,4 @@ Executable xapi_script_storage
   MainIs:             main.ml
   Custom:             true
   Install:            false
-  BuildDepends:       xcp, xcp.storage, xcp.rrd, async_inotify, threads, message_switch.async (>= 0.11.0), rpclib, xapi-storage, sexplib, sexplib.syntax, rpclib, rpclib.syntax
+  BuildDepends:       xcp, xcp.storage, xcp.rrd, async_inotify, threads, message_switch.async (>= 0.11.0), rpclib, xapi-storage, sexplib, ppx_sexp_conv, rpclib, ppx_deriving_rpc

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 2c22384c8337719c5d75ab0e5fc90afb)
+# DO NOT EDIT (digest: e05a6be8bb51317f3f3c21dac83a2d55)
 # 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
@@ -17,21 +17,21 @@ true: annot, bin_annot
 # Executable xapi_script_storage
 <main.{native,byte}>: pkg_async_inotify
 <main.{native,byte}>: pkg_message_switch.async
+<main.{native,byte}>: pkg_ppx_deriving_rpc
+<main.{native,byte}>: pkg_ppx_sexp_conv
 <main.{native,byte}>: pkg_rpclib
-<main.{native,byte}>: pkg_rpclib.syntax
 <main.{native,byte}>: pkg_sexplib
-<main.{native,byte}>: pkg_sexplib.syntax
 <main.{native,byte}>: pkg_threads
 <main.{native,byte}>: pkg_xapi-storage
 <main.{native,byte}>: pkg_xcp
 <main.{native,byte}>: pkg_xcp.rrd
 <main.{native,byte}>: pkg_xcp.storage
 <*.ml{,i,y}>: pkg_async_inotify
 <*.ml{,i,y}>: pkg_message_switch.async
+<*.ml{,i,y}>: pkg_ppx_deriving_rpc
+<*.ml{,i,y}>: pkg_ppx_sexp_conv
 <*.ml{,i,y}>: pkg_rpclib
-<*.ml{,i,y}>: pkg_rpclib.syntax
 <*.ml{,i,y}>: pkg_sexplib
-<*.ml{,i,y}>: pkg_sexplib.syntax
 <*.ml{,i,y}>: pkg_threads
 <*.ml{,i,y}>: pkg_xapi-storage
 <*.ml{,i,y}>: pkg_xcp

main.ml

@@ -18,7 +18,7 @@ module B = Backtrace
 open Core.Std
 open Async.Std
 
-open Types
+open Xapi_storage_script_types
 
 let use_syslog = ref false
 
@@ -161,7 +161,7 @@ module Attached_SRs = struct
   type state = {
     sr: string;
     uids: string list;
-  } with sexp
+  } [@@deriving sexp]
 
   let sr_table : state String.Table.t ref = ref (String.Table.create ())
   let state_path = ref None