Browse files

Attempt to fix the build

  • Loading branch information...
1 parent 4a83707 commit 226673098722dc4150044aa854564c3010edf1de David Scott committed Aug 27, 2012
Showing with 75 additions and 24 deletions.
  1. +17 −4 _oasis
  2. +3 −5 _tags
  3. +2 −1 client/xs_client.ml
  4. +2 −2 core/META
  5. +51 −12 setup.ml
View
21 _oasis
@@ -11,7 +11,7 @@ Library xenstore
Path: core
Findlibname: xenstore
Modules: Xs_packet
- BuildDepends: lwt, cstruct, cstruct.syntax, lwt
+ BuildDepends: lwt, cstruct, cstruct.syntax
Library xenstore_client
Path: client
@@ -21,6 +21,7 @@ Library xenstore_client
BuildDepends: lwt, xenstore
Library xenstore_unix
+ Build$: flag(unix)
Path: unix
Findlibname: unix
FindlibParent: xenstore
@@ -38,12 +39,13 @@ Library xenstore_server
BuildDepends: lwt, xenstore
Executable xen_stubdom
+ Build$: flag(xen)
Path: xen
MainIs: sleep.ml
Custom: true
CompiledObject: best
Install: false
- BuildDepends: lwt, xenstore, xenstore.server, mirage
+ BuildDepends: lwt, xenstore, xenstore.server, cstruct, mirage
Executable xs_test
Path: lib_test
@@ -52,7 +54,7 @@ Executable xs_test
Custom: true
CompiledObject: best
Install: false
- BuildDepends: lwt, lwt.unix, xenstore, oUnit
+ BuildDepends: lwt, xenstore, oUnit
Executable server_test
Path: server_test
@@ -61,9 +63,10 @@ Executable server_test
Custom: true
CompiledObject: best
Install: false
- BuildDepends: lwt, lwt.unix, xenstore, xenstore.server, oUnit
+ BuildDepends: lwt, xenstore, xenstore.server, oUnit, mirage
Executable server_unix
+ Build$: flag(unix)
Path: server_unix
MainIs: server_unix.ml
Custom: true
@@ -72,6 +75,7 @@ Executable server_unix
BuildDepends: lwt, lwt.unix, xenstore, xenstore.server, xenstore.unix
Executable xs
+ Build$: flag(unix)
Path: cli
MainIs: xs_client_cli.ml
Custom: true
@@ -80,6 +84,7 @@ Executable xs
BuildDepends: lwt, lwt.unix, xenstore, xenstore.client, xenstore.unix
Executable xsbench
+ Build$: flag(unix)
Path: bench
MainIs: xs_bench.ml
Custom: true
@@ -89,6 +94,14 @@ Executable xsbench
Flag tests
Description: Build and run tests
+ Default: false
+
+Flag unix
+ Description: Build Unix executables
+ Default: false
+
+Flag xen
+ Description: Build xen kernels
Default: true
Test xs_test
View
8 _tags
@@ -1,5 +1,5 @@
# OASIS_START
-# DO NOT EDIT (digest: e54ce439d15652a51fc3d80047e9baaa)
+# DO NOT EDIT (digest: 007aac8e18b23e2d1f4a0c5a81bee2a9)
# Library xenstore
"core": include
<core/*.ml{,i}>: pkg_lwt
@@ -41,14 +41,14 @@
<server_test/server_test.{native,byte}>: use_xenstore_server
<server_test/server_test.{native,byte}>: use_xenstore
<server_test/server_test.{native,byte}>: pkg_oUnit
-<server_test/server_test.{native,byte}>: pkg_lwt.unix
+<server_test/server_test.{native,byte}>: pkg_mirage
<server_test/server_test.{native,byte}>: pkg_lwt
<server_test/server_test.{native,byte}>: pkg_cstruct.syntax
<server_test/server_test.{native,byte}>: pkg_cstruct
<server_test/*.ml{,i}>: use_xenstore_server
<server_test/*.ml{,i}>: use_xenstore
<server_test/*.ml{,i}>: pkg_oUnit
-<server_test/*.ml{,i}>: pkg_lwt.unix
+<server_test/*.ml{,i}>: pkg_mirage
<server_test/*.ml{,i}>: pkg_lwt
<server_test/*.ml{,i}>: pkg_cstruct.syntax
<server_test/*.ml{,i}>: pkg_cstruct
@@ -104,13 +104,11 @@
# Executable xs_test
<lib_test/xs_test.{native,byte}>: use_xenstore
<lib_test/xs_test.{native,byte}>: pkg_oUnit
-<lib_test/xs_test.{native,byte}>: pkg_lwt.unix
<lib_test/xs_test.{native,byte}>: pkg_lwt
<lib_test/xs_test.{native,byte}>: pkg_cstruct.syntax
<lib_test/xs_test.{native,byte}>: pkg_cstruct
<lib_test/*.ml{,i}>: use_xenstore
<lib_test/*.ml{,i}>: pkg_oUnit
-<lib_test/*.ml{,i}>: pkg_lwt.unix
<lib_test/*.ml{,i}>: pkg_lwt
<lib_test/*.ml{,i}>: pkg_cstruct.syntax
<lib_test/*.ml{,i}>: pkg_cstruct
View
3 client/xs_client.ml
@@ -129,7 +129,8 @@ module Client = functor(T: TRANSPORT) -> struct
Printf.fprintf stderr "Caught: %s\n%!" (Printexc.to_string e);
lwt () = begin match e with
| Xs_packet.Response_parser_failed x ->
- Lwt_io.hexdump Lwt_io.stderr x
+(* Lwt_io.hexdump Lwt_io.stderr x *)
+ return ()
| _ -> return () end in
t.dispatcher_shutting_down <- true; (* no more hashtable entries after this *)
(* all blocking threads are failed with our exception *)
View
4 core/META
@@ -1,8 +1,8 @@
# OASIS_START
-# DO NOT EDIT (digest: ceb0abd4a6c447706c1381a235ac063b)
+# DO NOT EDIT (digest: 5001429814e8d29bf1a400a60c7b9f57)
version = "0.9-dev"
description = "Xenstore protocol library"
-requires = "lwt cstruct cstruct.syntax lwt"
+requires = "lwt cstruct cstruct.syntax"
archive(byte) = "xenstore.cma"
archive(native) = "xenstore.cmxa"
exists_if = "xenstore.cma"
View
63 setup.ml
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.2.0 *)
(* OASIS_START *)
-(* DO NOT EDIT (digest: fa94ce9621b3c98cff4408ef37d79ef8) *)
+(* DO NOT EDIT (digest: 7284c78ed6cb8cd7cab4c0a1d378c19f) *)
(*
Regenerated by OASIS v0.2.0
Visit http://oasis.forge.ocamlcore.org for more information and
@@ -5216,8 +5216,7 @@ let setup_t =
[
FindlibPackage ("lwt", None);
FindlibPackage ("cstruct", None);
- FindlibPackage ("cstruct.syntax", None);
- FindlibPackage ("lwt", None)
+ FindlibPackage ("cstruct.syntax", None)
];
bs_build_tools = [ExternalTool "ocamlbuild"];
bs_c_sources = [];
@@ -5294,7 +5293,11 @@ let setup_t =
cs_plugin_data = [];
},
{
- bs_build = [(OASISExpr.EBool true, true)];
+ bs_build =
+ [
+ (OASISExpr.EBool true, false);
+ (OASISExpr.EFlag "unix", true)
+ ];
bs_install = [(OASISExpr.EBool true, true)];
bs_path = "unix";
bs_compiled_object = Best;
@@ -5382,10 +5385,10 @@ let setup_t =
bs_build_depends =
[
FindlibPackage ("lwt", None);
- FindlibPackage ("lwt.unix", None);
InternalLibrary "xenstore";
InternalLibrary "xenstore_server";
- FindlibPackage ("oUnit", None)
+ FindlibPackage ("oUnit", None);
+ FindlibPackage ("mirage", None)
];
bs_build_tools = [ExternalTool "ocamlbuild"];
bs_c_sources = [];
@@ -5398,14 +5401,28 @@ let setup_t =
bs_nativeopt = [(OASISExpr.EBool true, [])];
},
{exec_custom = true; exec_main_is = "server_test.ml"; });
+ Flag
+ ({
+ cs_name = "unix";
+ cs_data = PropList.Data.create ();
+ cs_plugin_data = [];
+ },
+ {
+ flag_description = Some "Build Unix executables";
+ flag_default = [(OASISExpr.EBool true, false)];
+ });
Executable
({
cs_name = "server_unix";
cs_data = PropList.Data.create ();
cs_plugin_data = [];
},
{
- bs_build = [(OASISExpr.EBool true, true)];
+ bs_build =
+ [
+ (OASISExpr.EBool true, false);
+ (OASISExpr.EFlag "unix", true)
+ ];
bs_install = [(OASISExpr.EBool true, true)];
bs_path = "server_unix";
bs_compiled_object = Best;
@@ -5435,7 +5452,11 @@ let setup_t =
cs_plugin_data = [];
},
{
- bs_build = [(OASISExpr.EBool true, true)];
+ bs_build =
+ [
+ (OASISExpr.EBool true, false);
+ (OASISExpr.EFlag "xen", true)
+ ];
bs_install = [(OASISExpr.EBool true, false)];
bs_path = "xen";
bs_compiled_object = Best;
@@ -5444,6 +5465,7 @@ let setup_t =
FindlibPackage ("lwt", None);
InternalLibrary "xenstore";
InternalLibrary "xenstore_server";
+ FindlibPackage ("cstruct", None);
FindlibPackage ("mirage", None)
];
bs_build_tools = [ExternalTool "ocamlbuild"];
@@ -5464,7 +5486,11 @@ let setup_t =
cs_plugin_data = [];
},
{
- bs_build = [(OASISExpr.EBool true, true)];
+ bs_build =
+ [
+ (OASISExpr.EBool true, false);
+ (OASISExpr.EFlag "unix", true)
+ ];
bs_install = [(OASISExpr.EBool true, true)];
bs_path = "cli";
bs_compiled_object = Best;
@@ -5528,7 +5554,6 @@ let setup_t =
bs_build_depends =
[
FindlibPackage ("lwt", None);
- FindlibPackage ("lwt.unix", None);
InternalLibrary "xenstore";
FindlibPackage ("oUnit", None)
];
@@ -5550,7 +5575,11 @@ let setup_t =
cs_plugin_data = [];
},
{
- bs_build = [(OASISExpr.EBool true, true)];
+ bs_build =
+ [
+ (OASISExpr.EBool true, false);
+ (OASISExpr.EFlag "unix", true)
+ ];
bs_install = [(OASISExpr.EBool true, true)];
bs_path = "bench";
bs_compiled_object = Best;
@@ -5575,13 +5604,23 @@ let setup_t =
{exec_custom = true; exec_main_is = "xs_bench.ml"; });
Flag
({
+ cs_name = "xen";
+ cs_data = PropList.Data.create ();
+ cs_plugin_data = [];
+ },
+ {
+ flag_description = Some "Build xen kernels";
+ flag_default = [(OASISExpr.EBool true, true)];
+ });
+ Flag
+ ({
cs_name = "tests";
cs_data = PropList.Data.create ();
cs_plugin_data = [];
},
{
flag_description = Some "Build and run tests";
- flag_default = [(OASISExpr.EBool true, true)];
+ flag_default = [(OASISExpr.EBool true, false)];
});
Test
({

0 comments on commit 2266730

Please sign in to comment.