Merge pull request #21 from xapi-project/private/edvint/split

Author: psafont

.github/workflows/ocaml-ci.yml

@@ -13,21 +13,27 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Pull configuration from xs-opam
         run: |
           curl --fail --silent https://raw.githubusercontent.com/xapi-project/xs-opam/master/tools/xs-opam-ci.env | cut -f2 -d " " > .env
 
       - name: Load environment file
         id: dotenv
-        uses: falti/dotenv-action@v0.2.4
+        uses: falti/dotenv-action@v1.1.4
 
       - name: Use ocaml
-        uses: avsm/setup-ocaml@v1
+        uses: avsm/setup-ocaml@v3
         with:
-          ocaml-version: ${{ steps.dotenv.outputs.ocaml_version_full }}
-          opam-repository: ${{ steps.dotenv.outputs.repository }}
+          ocaml-compiler: ${{ steps.dotenv.outputs.ocaml_version_full }}
+          opam-repositories: |
+            xs-opam: ${{ steps.dotenv.outputs.repository }}
+          dune-cache: true
+          opam-pin: false
+          cache-prefix: v3-${{ steps.system-info.outputs.name }}-${{ steps.system-info.outputs.release }}
+        env:
+          DUNE_CACHE_STORAGE_MODE: copy
 
       - name: Install dependencies
         run: |

META.xenstore_transport.template

@@ -1,2 +1,3 @@
-(lang dune 1.0)
+(lang dune 2.0)
+
 (name xenstore-tool)

dune-project

@@ -1,6 +1,8 @@
 (library
  (name xenstore_transport)
  (public_name xenstore_transport)
- (libraries lwt xenstore xenstore.client lwt.unix)
+ (libraries
+  (re_export xenstore_transport.unix)
+  (re_export xenstore_transport.lwt))
  (wrapped false)
  (flags :standard -safe-string))

lib/dune

@@ -0,0 +1,7 @@
+(library
+ (name xenstore_transport_lwt)
+ (public_name xenstore_transport.lwt)
+ (libraries lwt xenstore xenstore.client lwt.unix xenstore_transport.unix)
+ (wrapped false)
+ (flags
+  (:standard -safe-string)))

lib/lwt/dune

@@ -0,0 +1,6 @@
+(library
+ (name xenstore_transport_core)
+ (public_name xenstore_transport.unix)
+ (libraries unix)
+ (wrapped false)
+ (flags :standard -safe-string))

lib/xs.ml renamed to lib/lwt/xs.ml

@@ -40,7 +40,7 @@ let create () =
         raise e
     end
   | _ ->
-    Unix.openfile path [Lwt_unix.O_RDWR] 0o0
+    Unix.openfile path [Unix.O_RDWR] 0o0
 
 let destroy fd = Unix.close fd
 let read fd = Unix.read fd