Move runtime to lib_runtime/

_oasis

@@ -7,20 +7,21 @@ License:     ISC
 Plugins:     META (0.4)
 BuildTools:  ocamlbuild
 
+Library "mirage-runtime"
+  Path:               lib_runtime
+  Findlibparent:      mirage
+  Findlibname:        runtime
+  Modules:            Mirage_runtime
+  BuildDepends:       functoria.runtime, ipaddr
+
 Library mirage
   CompiledObject:     best
   Path:               lib
   Findlibname:        mirage
   Modules:            Mirage
-  InternalModules:    Mirage_key
-  BuildDepends:       ipaddr,functoria,lwt,mirage-types,mirage-types.lwt
-
-Library "mirage-runtime"
-  Path:               lib
-  Findlibname:        runtime
-  Modules:            Mirage_runtime
-  Findlibparent:      mirage
-  BuildDepends:       functoria.runtime
+  InternalModules:    Mirage_key, Mirage_version
+  BuildDepends:
+    ipaddr,functoria,lwt,mirage-types,mirage-types.lwt,mirage.runtime
 
 Executable mirage
   CompiledObject:     best

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 49bdd1fd7a86184faed7ecd410396db0)
+# DO NOT EDIT (digest: 0b9815131bf53d4130ae776902c721a1)
 # 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
@@ -14,24 +14,29 @@ true: annot, bin_annot
 ".git": not_hygienic
 "_darcs": -traverse
 "_darcs": not_hygienic
+# Library mirage-runtime
+"lib_runtime/mirage-runtime.cmxs": use_mirage-runtime
+<lib_runtime/*.ml{,i,y}>: pkg_functoria.runtime
+<lib_runtime/*.ml{,i,y}>: pkg_ipaddr
 # Library mirage
 "lib/mirage.cmxs": use_mirage
-# Library mirage-runtime
-"lib/mirage-runtime.cmxs": use_mirage-runtime
-<lib/*.ml{,i,y}>: pkg_functoria.runtime
 # Executable mirage
 <lib/main.{native,byte}>: pkg_functoria
+<lib/main.{native,byte}>: pkg_functoria.runtime
 <lib/main.{native,byte}>: pkg_ipaddr
 <lib/main.{native,byte}>: pkg_lwt
 <lib/main.{native,byte}>: pkg_mirage-types
 <lib/main.{native,byte}>: pkg_mirage-types.lwt
 <lib/main.{native,byte}>: use_mirage
+<lib/main.{native,byte}>: use_mirage-runtime
 <lib/*.ml{,i,y}>: pkg_functoria
+<lib/*.ml{,i,y}>: pkg_functoria.runtime
 <lib/*.ml{,i,y}>: pkg_ipaddr
 <lib/*.ml{,i,y}>: pkg_lwt
 <lib/*.ml{,i,y}>: pkg_mirage-types
 <lib/*.ml{,i,y}>: pkg_mirage-types.lwt
 <lib/*.ml{,i,y}>: use_mirage
+<lib/*.ml{,i,y}>: use_mirage-runtime
 # OASIS_STOP
 true: debug, bin_annot, annot, principal
 <types/*.mli>: pkg_cstruct, pkg_io-page, pkg_ipaddr, pkg_lwt
@@ -43,4 +48,4 @@ true: bin_annot
 true: keep_locs
 
 # Force the runtime to be unix-independent.
-<lib/*runtime*>: dontlink(unix)
+<lib_runtime/*>: dontlink(unix)

lib/META

@@ -1,8 +1,9 @@
 # OASIS_START
-# DO NOT EDIT (digest: d0b4c85a0b5f6e0e21eeea5a2997888c)
+# DO NOT EDIT (digest: c5dbf7bf603d6fdfed59e0357639c310)
 version = "2.6.0"
 description = "Mirage configuration tool"
-requires = "ipaddr functoria lwt mirage-types mirage-types.lwt"
+requires =
+"ipaddr functoria lwt mirage-types mirage-types.lwt mirage.runtime"
 archive(byte) = "mirage.cma"
 archive(byte, plugin) = "mirage.cma"
 archive(native) = "mirage.cmxa"
@@ -11,7 +12,7 @@ exists_if = "mirage.cma"
 package "runtime" (
  version = "2.6.0"
  description = "Mirage configuration tool"
- requires = "functoria.runtime"
+ requires = "functoria.runtime ipaddr"
  archive(byte) = "mirage-runtime.cma"
  archive(byte, plugin) = "mirage-runtime.cma"
  archive(native) = "mirage-runtime.cmxa"

lib/mirage.mldylib

@@ -1,5 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: eeb7b9ae3ea8b8bafd8d3501f86209f2)
+# DO NOT EDIT (digest: 049088a3b4fbd7a5e5f6976534f7434e)
 Mirage
 Mirage_key
+Mirage_version
 # OASIS_STOP

lib/mirage.mllib

@@ -1,5 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: eeb7b9ae3ea8b8bafd8d3501f86209f2)
+# DO NOT EDIT (digest: 049088a3b4fbd7a5e5f6976534f7434e)
 Mirage
 Mirage_key
+Mirage_version
 # OASIS_STOP

mirage.opam

@@ -9,7 +9,10 @@ dev-repo:     "https://github.com/mirage/mirage.git"
 tags:         ["org:mirage" "org:xapi-project"]
 
 build: [
-  ["./configure" "--bindir" "%{bin}%"]
+  ["ocaml" "setup.ml" "-configure"
+   "--prefix" prefix
+   "--bindir" bin
+  ]
   [make]
 ]
 install: [make "install"]

myocamlbuild.ml

@@ -1,5 +1,5 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: e8c0d26b673f1dec72069e5be9024c61) *)
+(* DO NOT EDIT (digest: 69c019001895c298fa6a038c2d0fec5c) *)
 module OASISGettext = struct
 (* # 22 "src/oasis/OASISGettext.ml" *)
 
@@ -608,10 +608,10 @@ open Ocamlbuild_plugin;;
 let package_default =
   {
      MyOCamlbuildBase.lib_ocaml =
-       [("mirage", ["lib"], []); ("mirage-runtime", ["lib"], [])];
+       [("mirage-runtime", ["lib_runtime"], []); ("mirage", ["lib"], [])];
      lib_c = [];
      flags = [];
-     includes = []
+     includes = [("lib", ["lib_runtime"])]
   }
   ;;
 

setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.5 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 299b55ab3a385a364698a13ab3f7fd77) *)
+(* DO NOT EDIT (digest: aec7eb1fcec42bd639c1f303902e8b5b) *)
 (*
    Regenerated by OASIS v0.4.5
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6744,22 +6744,19 @@ let setup_t =
             [
                Library
                  ({
-                     cs_name = "mirage";
+                     cs_name = "mirage-runtime";
                      cs_data = PropList.Data.create ();
                      cs_plugin_data = []
                   },
                    {
                       bs_build = [(OASISExpr.EBool true, true)];
                       bs_install = [(OASISExpr.EBool true, true)];
-                      bs_path = "lib";
+                      bs_path = "lib_runtime";
                       bs_compiled_object = Best;
                       bs_build_depends =
                         [
-                           FindlibPackage ("ipaddr", None);
-                           FindlibPackage ("functoria", None);
-                           FindlibPackage ("lwt", None);
-                           FindlibPackage ("mirage-types", None);
-                           FindlibPackage ("mirage-types.lwt", None)
+                           FindlibPackage ("functoria.runtime", None);
+                           FindlibPackage ("ipaddr", None)
                         ];
                       bs_build_tools = [ExternalTool "ocamlbuild"];
                       bs_c_sources = [];
@@ -6772,16 +6769,16 @@ let setup_t =
                       bs_nativeopt = [(OASISExpr.EBool true, [])]
                    },
                    {
-                      lib_modules = ["Mirage"];
+                      lib_modules = ["Mirage_runtime"];
                       lib_pack = false;
-                      lib_internal_modules = ["Mirage_key"];
-                      lib_findlib_parent = None;
-                      lib_findlib_name = Some "mirage";
+                      lib_internal_modules = [];
+                      lib_findlib_parent = Some "mirage";
+                      lib_findlib_name = Some "runtime";
                       lib_findlib_containers = []
                    });
                Library
                  ({
-                     cs_name = "mirage-runtime";
+                     cs_name = "mirage";
                      cs_data = PropList.Data.create ();
                      cs_plugin_data = []
                   },
@@ -6791,7 +6788,14 @@ let setup_t =
                       bs_path = "lib";
                       bs_compiled_object = Best;
                       bs_build_depends =
-                        [FindlibPackage ("functoria.runtime", None)];
+                        [
+                           FindlibPackage ("ipaddr", None);
+                           FindlibPackage ("functoria", None);
+                           FindlibPackage ("lwt", None);
+                           FindlibPackage ("mirage-types", None);
+                           FindlibPackage ("mirage-types.lwt", None);
+                           InternalLibrary "mirage-runtime"
+                        ];
                       bs_build_tools = [ExternalTool "ocamlbuild"];
                       bs_c_sources = [];
                       bs_data_files = [];
@@ -6803,11 +6807,11 @@ let setup_t =
                       bs_nativeopt = [(OASISExpr.EBool true, [])]
                    },
                    {
-                      lib_modules = ["Mirage_runtime"];
+                      lib_modules = ["Mirage"];
                       lib_pack = false;
-                      lib_internal_modules = [];
-                      lib_findlib_parent = Some "mirage";
-                      lib_findlib_name = Some "runtime";
+                      lib_internal_modules = ["Mirage_key"; "Mirage_version"];
+                      lib_findlib_parent = None;
+                      lib_findlib_name = Some "mirage";
                       lib_findlib_containers = []
                    });
                Executable
@@ -6873,14 +6877,15 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.5";
-     oasis_digest = Some "Gnd\189\015\149\130\027\220\155\127\137\197I,\147";
+     oasis_digest =
+       Some "\191Ib\022\170\224\149\022\021\245\255e7\160\248\191";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
   };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 6885 "setup.ml"
+# 6890 "setup.ml"
 (* OASIS_STOP *)
 let () = setup ();;