Merge pull request #10 from djs55/change-ocamlfind

Rename ocamlfind package to mirage-block-xen{,.front,.back}
mirage · Dec 7, 2013 · 8ea517e · 8ea517e
2 parents 8b8beee + f5a98ec
commit 8ea517e
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 54 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 .PHONY: all clean install build
 all: build doc
 
-NAME=xenblock
+NAME=mirage-block-xen
 J=4
 
 include config.mk

diff --git a/_oasis b/_oasis
@@ -1,5 +1,5 @@
 OASISFormat: 0.3
-Name:        ocaml-xen-block-driver
+Name:        mirage-block-xen
 Version:     0.9.9
 Synopsis:    Xen block frontend and backend driver implementation
 Authors:     Jonathan Ludlam, Anil Madhavapeddy, David Scott
@@ -15,27 +15,27 @@ Flag blkback
   Default:            true
   Description:        build the backend driver
 
-Library xenblock
+Library mirage_block_xen
   CompiledObject:     best
   Path:               lib
-  Findlibname:        xenblock
+  Findlibname:        mirage-block-xen
   Modules:            Blkproto, Device_number
   BuildDepends:       cstruct, cstruct.syntax
 
-Library blkfront
+Library mirage_block_xen_front
   Build$:             flag(blkfront)
   CompiledObject:     best
   Path:               lib
-  Findlibparent:      xenblock
+  Findlibparent:      mirage_block_xen
   Findlibname:        front
   Modules:            Blkfront
-  BuildDepends:       lwt, lwt.syntax, cstruct, cstruct.syntax, mirage-xen, mirage-types, shared-memory-ring, shared-memory-ring.lwt, xenblock
+  BuildDepends:       lwt, lwt.syntax, cstruct, cstruct.syntax, mirage-types, shared-memory-ring, shared-memory-ring.lwt, mirage-block-xen
 
-Library blkback
+Library mirage_block_xen_back
   Build$:             flag(blkback)
   CompiledObject:     best
   Path:               lib
-  Findlibparent:      xenblock
+  Findlibparent:      mirage_block_xen
   Findlibname:        back
   Modules:            Blkback
-  BuildDepends:       lwt, lwt.syntax, cstruct, cstruct.syntax, mirage-xen, shared-memory-ring, shared-memory-ring.lwt, xenblock, xenctrl
+  BuildDepends:       lwt, lwt.syntax, cstruct, cstruct.syntax, shared-memory-ring, shared-memory-ring.lwt, mirage-block-xen, xenctrl
diff --git a/_tags b/_tags
@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 331d59dcafd1cda8cb8d9461461b5927)
+# DO NOT EDIT (digest: b80f2d33761f6766cf984d438d7dd8f0)
 # 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
@@ -13,19 +13,18 @@
 ".git": not_hygienic
 "_darcs": -traverse
 "_darcs": not_hygienic
-# Library xenblock
-"lib/xenblock.cmxs": use_xenblock
-# Library blkfront
-"lib/blkfront.cmxs": use_blkfront
+# Library mirage_block_xen
+"lib/mirage_block_xen.cmxs": use_mirage_block_xen
+# Library mirage_block_xen_front
+"lib/mirage_block_xen_front.cmxs": use_mirage_block_xen_front
 <lib/*.ml{,i}>: pkg_mirage-types
-# Library blkback
-"lib/blkback.cmxs": use_blkback
-<lib/*.ml{,i}>: use_xenblock
+# Library mirage_block_xen_back
+"lib/mirage_block_xen_back.cmxs": use_mirage_block_xen_back
+<lib/*.ml{,i}>: use_mirage_block_xen
 <lib/*.ml{,i}>: pkg_lwt
 <lib/*.ml{,i}>: pkg_lwt.syntax
 <lib/*.ml{,i}>: pkg_cstruct
 <lib/*.ml{,i}>: pkg_cstruct.syntax
-<lib/*.ml{,i}>: pkg_mirage-xen
 <lib/*.ml{,i}>: pkg_shared-memory-ring
 <lib/*.ml{,i}>: pkg_shared-memory-ring.lwt
 <lib/*.ml{,i}>: pkg_xenctrl

diff --git a/lib/META b/lib/META
@@ -1,35 +1,35 @@
 # OASIS_START
-# DO NOT EDIT (digest: 23dd5356ed801dd35f2cee4a1959c72c)
+# DO NOT EDIT (digest: 02c79c5a53813c4e3efca390f0487e99)
 version = "0.9.9"
 description = "Xen block frontend and backend driver implementation"
 requires = "cstruct cstruct.syntax"
-archive(byte) = "xenblock.cma"
-archive(byte, plugin) = "xenblock.cma"
-archive(native) = "xenblock.cmxa"
-archive(native, plugin) = "xenblock.cmxs"
-exists_if = "xenblock.cma"
+archive(byte) = "mirage_block_xen.cma"
+archive(byte, plugin) = "mirage_block_xen.cma"
+archive(native) = "mirage_block_xen.cmxa"
+archive(native, plugin) = "mirage_block_xen.cmxs"
+exists_if = "mirage_block_xen.cma"
 package "front" (
  version = "0.9.9"
  description = "Xen block frontend and backend driver implementation"
  requires =
- "lwt lwt.syntax cstruct cstruct.syntax mirage-xen mirage-types shared-memory-ring shared-memory-ring.lwt xenblock"
- archive(byte) = "blkfront.cma"
- archive(byte, plugin) = "blkfront.cma"
- archive(native) = "blkfront.cmxa"
- archive(native, plugin) = "blkfront.cmxs"
- exists_if = "blkfront.cma"
+ "lwt lwt.syntax cstruct cstruct.syntax mirage-types shared-memory-ring shared-memory-ring.lwt mirage-block-xen"
+ archive(byte) = "mirage_block_xen_front.cma"
+ archive(byte, plugin) = "mirage_block_xen_front.cma"
+ archive(native) = "mirage_block_xen_front.cmxa"
+ archive(native, plugin) = "mirage_block_xen_front.cmxs"
+ exists_if = "mirage_block_xen_front.cma"
 )
 
 package "back" (
  version = "0.9.9"
  description = "Xen block frontend and backend driver implementation"
  requires =
- "lwt lwt.syntax cstruct cstruct.syntax mirage-xen shared-memory-ring shared-memory-ring.lwt xenblock xenctrl"
- archive(byte) = "blkback.cma"
- archive(byte, plugin) = "blkback.cma"
- archive(native) = "blkback.cmxa"
- archive(native, plugin) = "blkback.cmxs"
- exists_if = "blkback.cma"
+ "lwt lwt.syntax cstruct cstruct.syntax shared-memory-ring shared-memory-ring.lwt mirage-block-xen xenctrl"
+ archive(byte) = "mirage_block_xen_back.cma"
+ archive(byte, plugin) = "mirage_block_xen_back.cma"
+ archive(native) = "mirage_block_xen_back.cmxa"
+ archive(native, plugin) = "mirage_block_xen_back.cmxs"
+ exists_if = "mirage_block_xen_back.cma"
 )
 # OASIS_STOP
 
diff --git a/lib/xenblock.mllib → lib/mirage_block_xen.mllib b/lib/xenblock.mllib → lib/mirage_block_xen.mllib
diff --git a/lib/blkback.mllib → lib/mirage_block_xen_back.mllib b/lib/blkback.mllib → lib/mirage_block_xen_back.mllib
diff --git a/lib/blkfront.mllib → lib/mirage_block_xen_front.mllib b/lib/blkfront.mllib → lib/mirage_block_xen_front.mllib
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
@@ -1,5 +1,5 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: aee8fcfff34b1538ccdf14a6c14d885f) *)
+(* DO NOT EDIT (digest: 545eb020955241de08b9c238046ed368) *)
 module OASISGettext = struct
 (* # 21 "src/oasis/OASISGettext.ml" *)
 
@@ -478,7 +478,11 @@ open Ocamlbuild_plugin;;
 let package_default =
   {
      MyOCamlbuildBase.lib_ocaml =
-       [("xenblock", ["lib"]); ("blkfront", ["lib"]); ("blkback", ["lib"])];
+       [
+          ("mirage_block_xen", ["lib"]);
+          ("mirage_block_xen_front", ["lib"]);
+          ("mirage_block_xen_back", ["lib"])
+       ];
      lib_c = [];
      flags = [];
      includes = [];
@@ -487,6 +491,6 @@ let package_default =
 
 let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
 
-# 491 "myocamlbuild.ml"
+# 495 "myocamlbuild.ml"
 (* OASIS_STOP *)
 Ocamlbuild_plugin.dispatch dispatch_default;;
diff --git a/setup.ml b/setup.ml
@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.3.1 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 72c7973360c0910a155a34af35909926) *)
+(* DO NOT EDIT (digest: 52694d691db3c3d499bac15b1bac86ff) *)
 (*
    Regenerated by OASIS v0.3.0
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -5577,7 +5577,7 @@ let setup_t =
           oasis_version = "0.3";
           ocaml_version = None;
           findlib_version = None;
-          name = "ocaml-xen-block-driver";
+          name = "mirage-block-xen";
           version = "0.9.9";
           license =
             OASISLicense.DEP5License
@@ -5653,7 +5653,7 @@ let setup_t =
                       });
                Library
                  ({
-                     cs_name = "xenblock";
+                     cs_name = "mirage_block_xen";
                      cs_data = PropList.Data.create ();
                      cs_plugin_data = [];
                      },
@@ -5682,12 +5682,12 @@ let setup_t =
                       lib_pack = false;
                       lib_internal_modules = [];
                       lib_findlib_parent = None;
-                      lib_findlib_name = Some "xenblock";
+                      lib_findlib_name = Some "mirage-block-xen";
                       lib_findlib_containers = [];
                       });
                Library
                  ({
-                     cs_name = "blkfront";
+                     cs_name = "mirage_block_xen_front";
                      cs_data = PropList.Data.create ();
                      cs_plugin_data = [];
                      },
@@ -5706,11 +5706,10 @@ let setup_t =
                            FindlibPackage ("lwt.syntax", None);
                            FindlibPackage ("cstruct", None);
                            FindlibPackage ("cstruct.syntax", None);
-                           FindlibPackage ("mirage-xen", None);
                            FindlibPackage ("mirage-types", None);
                            FindlibPackage ("shared-memory-ring", None);
                            FindlibPackage ("shared-memory-ring.lwt", None);
-                           InternalLibrary "xenblock"
+                           InternalLibrary "mirage_block_xen"
                         ];
                       bs_build_tools = [ExternalTool "ocamlbuild"];
                       bs_c_sources = [];
@@ -5726,13 +5725,13 @@ let setup_t =
                       lib_modules = ["Blkfront"];
                       lib_pack = false;
                       lib_internal_modules = [];
-                      lib_findlib_parent = Some "xenblock";
+                      lib_findlib_parent = Some "mirage_block_xen";
                       lib_findlib_name = Some "front";
                       lib_findlib_containers = [];
                       });
                Library
                  ({
-                     cs_name = "blkback";
+                     cs_name = "mirage_block_xen_back";
                      cs_data = PropList.Data.create ();
                      cs_plugin_data = [];
                      },
@@ -5751,10 +5750,9 @@ let setup_t =
                            FindlibPackage ("lwt.syntax", None);
                            FindlibPackage ("cstruct", None);
                            FindlibPackage ("cstruct.syntax", None);
-                           FindlibPackage ("mirage-xen", None);
                            FindlibPackage ("shared-memory-ring", None);
                            FindlibPackage ("shared-memory-ring.lwt", None);
-                           InternalLibrary "xenblock";
+                           InternalLibrary "mirage_block_xen";
                            FindlibPackage ("xenctrl", None)
                         ];
                       bs_build_tools = [ExternalTool "ocamlbuild"];
@@ -5771,7 +5769,7 @@ let setup_t =
                       lib_modules = ["Blkback"];
                       lib_pack = false;
                       lib_internal_modules = [];
-                      lib_findlib_parent = Some "xenblock";
+                      lib_findlib_parent = Some "mirage_block_xen";
                       lib_findlib_name = Some "back";
                       lib_findlib_containers = [];
                       })
@@ -5782,14 +5780,14 @@ let setup_t =
           };
      oasis_fn = Some "_oasis";
      oasis_version = "0.3.0";
-     oasis_digest = Some "\133\024\255\167*\139L\135\149ep\021L\146bC";
+     oasis_digest = Some "\233k%[.\200\211\243`|\171\231\028\015\236%";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false;
      };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 5794 "setup.ml"
+# 5792 "setup.ml"
 (* OASIS_STOP *)
 let () = setup ();;