Skip to content

Commit

Permalink
Set Target:xen
Browse files Browse the repository at this point in the history
  • Loading branch information
David Scott committed Aug 30, 2012
1 parent fef751a commit 59c86cd
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 70 deletions.
1 change: 1 addition & 0 deletions _oasis
View file
Expand Up @@ -53,6 +53,7 @@ Library xenstore_server_domain

Executable server_xen
Build$: flag(xen)
Target: xen
CompiledObject: native
Path: xen
MainIs: server_xen.ml
Expand Down
98 changes: 49 additions & 49 deletions _tags
View file
@@ -1,5 +1,5 @@
# OASIS_START
# DO NOT EDIT (digest: 8d26d6ce5149b4e291dbf94b61e029b5)
# DO NOT EDIT (digest: 2f7bb9a8d07792c0275f2ac1591ab6da)
# 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
Expand Down Expand Up @@ -53,74 +53,74 @@
# Library xenstore_server_domain
"xen/xenstore_server_domain.cmxs": use_xenstore_server_domain
# Executable server_xen
"xen/server_xen.native,nobj.o": use_xenstore_server_domain
"xen/server_xen.native,nobj.o": use_xenstore_server
"xen/server_xen.native,nobj.o": use_xenstore
"xen/server_xen.native,nobj.o": pkg_lwt
"xen/server_xen.native,nobj.o": pkg_mirage
"xen/server_xen.native,nobj.o": pkg_cstruct
"xen/server_xen.native,nobj.o": pkg_cstruct.syntax
<xen/server_xen.{native,nobj.o}>: use_xenstore_server_domain
<xen/server_xen.{native,nobj.o}>: use_xenstore_server
<xen/server_xen.{native,nobj.o}>: use_xenstore
<xen/server_xen.{native,nobj.o}>: pkg_lwt
<xen/server_xen.{native,nobj.o}>: pkg_mirage
<xen/server_xen.{native,nobj.o}>: pkg_cstruct
<xen/server_xen.{native,nobj.o}>: pkg_cstruct.syntax
<xen/*.ml{,i}>: use_xenstore_server_domain
<xen/*.ml{,i}>: use_xenstore_server
<xen/*.ml{,i}>: use_xenstore
<xen/*.ml{,i}>: pkg_lwt
<xen/*.ml{,i}>: pkg_mirage
<xen/*.ml{,i}>: pkg_cstruct
<xen/*.ml{,i}>: pkg_cstruct.syntax
"xen/server_xen.native,nobj.o": custom
<xen/server_xen.{native,nobj.o}>: custom
# Executable xs_test
"lib_test/xs_test.native,nobj.o": use_xenstore
"lib_test/xs_test.native,nobj.o": pkg_lwt
"lib_test/xs_test.native,nobj.o": pkg_oUnit
"lib_test/xs_test.native,nobj.o": pkg_cstruct
"lib_test/xs_test.native,nobj.o": pkg_cstruct.syntax
<lib_test/xs_test.{native,nobj.o}>: use_xenstore
<lib_test/xs_test.{native,nobj.o}>: pkg_lwt
<lib_test/xs_test.{native,nobj.o}>: pkg_oUnit
<lib_test/xs_test.{native,nobj.o}>: pkg_cstruct
<lib_test/xs_test.{native,nobj.o}>: pkg_cstruct.syntax
<lib_test/*.ml{,i}>: use_xenstore
<lib_test/*.ml{,i}>: pkg_lwt
<lib_test/*.ml{,i}>: pkg_oUnit
<lib_test/*.ml{,i}>: pkg_cstruct
<lib_test/*.ml{,i}>: pkg_cstruct.syntax
"lib_test/xs_test.native,nobj.o": custom
<lib_test/xs_test.{native,nobj.o}>: custom
# Executable server_test
"server_test/server_test.native,nobj.o": use_xenstore_server
"server_test/server_test.native,nobj.o": use_xenstore
"server_test/server_test.native,nobj.o": pkg_lwt
"server_test/server_test.native,nobj.o": pkg_oUnit
"server_test/server_test.native,nobj.o": pkg_mirage
"server_test/server_test.native,nobj.o": pkg_cstruct
"server_test/server_test.native,nobj.o": pkg_cstruct.syntax
<server_test/server_test.{native,nobj.o}>: use_xenstore_server
<server_test/server_test.{native,nobj.o}>: use_xenstore
<server_test/server_test.{native,nobj.o}>: pkg_lwt
<server_test/server_test.{native,nobj.o}>: pkg_oUnit
<server_test/server_test.{native,nobj.o}>: pkg_mirage
<server_test/server_test.{native,nobj.o}>: pkg_cstruct
<server_test/server_test.{native,nobj.o}>: pkg_cstruct.syntax
<server_test/*.ml{,i}>: use_xenstore_server
<server_test/*.ml{,i}>: use_xenstore
<server_test/*.ml{,i}>: pkg_lwt
<server_test/*.ml{,i}>: pkg_oUnit
<server_test/*.ml{,i}>: pkg_mirage
<server_test/*.ml{,i}>: pkg_cstruct
<server_test/*.ml{,i}>: pkg_cstruct.syntax
"server_test/server_test.native,nobj.o": custom
<server_test/server_test.{native,nobj.o}>: custom
# Executable server_unix
"server_unix/server_unix.native,nobj.o": use_xenstore_unix
"server_unix/server_unix.native,nobj.o": use_xenstore_server
"server_unix/server_unix.native,nobj.o": use_xenstore
"server_unix/server_unix.native,nobj.o": pkg_lwt
"server_unix/server_unix.native,nobj.o": pkg_lwt.unix
"server_unix/server_unix.native,nobj.o": pkg_cstruct
"server_unix/server_unix.native,nobj.o": pkg_cstruct.syntax
<server_unix/server_unix.{native,nobj.o}>: use_xenstore_unix
<server_unix/server_unix.{native,nobj.o}>: use_xenstore_server
<server_unix/server_unix.{native,nobj.o}>: use_xenstore
<server_unix/server_unix.{native,nobj.o}>: pkg_lwt
<server_unix/server_unix.{native,nobj.o}>: pkg_lwt.unix
<server_unix/server_unix.{native,nobj.o}>: pkg_cstruct
<server_unix/server_unix.{native,nobj.o}>: pkg_cstruct.syntax
<server_unix/*.ml{,i}>: use_xenstore_unix
<server_unix/*.ml{,i}>: use_xenstore_server
<server_unix/*.ml{,i}>: use_xenstore
<server_unix/*.ml{,i}>: pkg_lwt
<server_unix/*.ml{,i}>: pkg_lwt.unix
<server_unix/*.ml{,i}>: pkg_cstruct
<server_unix/*.ml{,i}>: pkg_cstruct.syntax
"server_unix/server_unix.native,nobj.o": custom
<server_unix/server_unix.{native,nobj.o}>: custom
# Executable xs
"cli/xs_client_cli.native,nobj.o": use_xenstore_unix
"cli/xs_client_cli.native,nobj.o": use_xenstore_server
"cli/xs_client_cli.native,nobj.o": use_xenstore_client
"cli/xs_client_cli.native,nobj.o": use_xenstore
"cli/xs_client_cli.native,nobj.o": pkg_lwt
"cli/xs_client_cli.native,nobj.o": pkg_lwt.unix
"cli/xs_client_cli.native,nobj.o": pkg_cstruct
"cli/xs_client_cli.native,nobj.o": pkg_cstruct.syntax
<cli/xs_client_cli.{native,nobj.o}>: use_xenstore_unix
<cli/xs_client_cli.{native,nobj.o}>: use_xenstore_server
<cli/xs_client_cli.{native,nobj.o}>: use_xenstore_client
<cli/xs_client_cli.{native,nobj.o}>: use_xenstore
<cli/xs_client_cli.{native,nobj.o}>: pkg_lwt
<cli/xs_client_cli.{native,nobj.o}>: pkg_lwt.unix
<cli/xs_client_cli.{native,nobj.o}>: pkg_cstruct
<cli/xs_client_cli.{native,nobj.o}>: pkg_cstruct.syntax
<cli/*.ml{,i}>: use_xenstore_unix
<cli/*.ml{,i}>: use_xenstore_server
<cli/*.ml{,i}>: use_xenstore_client
Expand All @@ -129,16 +129,16 @@
<cli/*.ml{,i}>: pkg_lwt.unix
<cli/*.ml{,i}>: pkg_cstruct
<cli/*.ml{,i}>: pkg_cstruct.syntax
"cli/xs_client_cli.native,nobj.o": custom
<cli/xs_client_cli.{native,nobj.o}>: custom
# Executable xsbench
"bench/xs_bench.native,nobj.o": use_xenstore_unix
"bench/xs_bench.native,nobj.o": use_xenstore_server
"bench/xs_bench.native,nobj.o": use_xenstore_client
"bench/xs_bench.native,nobj.o": use_xenstore
"bench/xs_bench.native,nobj.o": pkg_lwt
"bench/xs_bench.native,nobj.o": pkg_lwt.unix
"bench/xs_bench.native,nobj.o": pkg_cstruct
"bench/xs_bench.native,nobj.o": pkg_cstruct.syntax
<bench/xs_bench.{native,nobj.o}>: use_xenstore_unix
<bench/xs_bench.{native,nobj.o}>: use_xenstore_server
<bench/xs_bench.{native,nobj.o}>: use_xenstore_client
<bench/xs_bench.{native,nobj.o}>: use_xenstore
<bench/xs_bench.{native,nobj.o}>: pkg_lwt
<bench/xs_bench.{native,nobj.o}>: pkg_lwt.unix
<bench/xs_bench.{native,nobj.o}>: pkg_cstruct
<bench/xs_bench.{native,nobj.o}>: pkg_cstruct.syntax
<bench/*.ml{,i}>: use_xenstore_unix
<bench/*.ml{,i}>: use_xenstore_server
<bench/*.ml{,i}>: use_xenstore_client
Expand All @@ -147,7 +147,7 @@
<bench/*.ml{,i}>: pkg_lwt.unix
<bench/*.ml{,i}>: pkg_cstruct
<bench/*.ml{,i}>: pkg_cstruct.syntax
"bench/xs_bench.native,nobj.o": custom
<bench/xs_bench.{native,nobj.o}>: custom
# OASIS_STOP
true: annot
<*/*>: syntax_camlp4o
Expand Down
69 changes: 48 additions & 21 deletions setup.ml
View file
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.2.0 *)

(* OASIS_START *)
(* DO NOT EDIT (digest: 435bdc7d8278283cfe1423f4e05f713a) *)
(* DO NOT EDIT (digest: d03a05106dbccce5006bb0b556697717) *)
(*
Regenerated by OASIS v0.3.1
Visit http://oasis.forge.ocamlcore.org for more information and
Expand Down Expand Up @@ -1077,6 +1077,7 @@ module OASISTypes = struct
{
exec_custom: bool;
exec_main_is: unix_filename;
exec_target: string option;
}

type flag =
Expand Down Expand Up @@ -2248,7 +2249,7 @@ module OASISFileUtil = struct
end


# 2251 "setup.ml"
# 2252 "setup.ml"
module BaseEnvLight = struct
# 21 "/home/djs/oasis/src/base/BaseEnvLight.ml"

Expand Down Expand Up @@ -2346,7 +2347,7 @@ module BaseEnvLight = struct
end


# 2349 "setup.ml"
# 2350 "setup.ml"
module BaseContext = struct
# 21 "/home/djs/oasis/src/base/BaseContext.ml"

Expand Down Expand Up @@ -4608,7 +4609,7 @@ module BaseSetup = struct
end


# 4611 "setup.ml"
# 4612 "setup.ml"
module InternalConfigurePlugin = struct
# 21 "/home/djs/oasis/src/plugins/internal/InternalConfigurePlugin.ml"

Expand Down Expand Up @@ -5449,7 +5450,7 @@ module InternalInstallPlugin = struct
end


# 5452 "setup.ml"
# 5453 "setup.ml"
module OCamlbuildCommon = struct
# 21 "/home/djs/oasis/src/plugins/ocamlbuild/OCamlbuildCommon.ml"

Expand Down Expand Up @@ -5692,13 +5693,15 @@ module OCamlbuildPlugin = struct

(* Add executable *)
let acc =
match bs.bs_compiled_object with
| Native ->
(target ".native") :: (target ".nobj.o") :: acc
| Best when bool_of_string (is_native ()) ->
match exec.exec_target, bs.bs_compiled_object with
| Some t, _ ->
(target ("." ^ t)) :: acc
| None, Native ->
(target ".native") :: (target ".nobj.o") :: acc
| Byte
| Best ->
| None, Best when bool_of_string (is_native ()) ->
(target ".native") :: (target ".nobj.o") :: acc
| None, Byte
| None, Best ->
(target ".byte") :: acc
in
acc
Expand Down Expand Up @@ -5804,7 +5807,7 @@ module OCamlbuildDocPlugin = struct
end


# 5807 "setup.ml"
# 5810 "setup.ml"
module CustomPlugin = struct
# 21 "/home/djs/oasis/src/plugins/custom/CustomPlugin.ml"

Expand Down Expand Up @@ -5940,7 +5943,7 @@ module CustomPlugin = struct
end


# 5943 "setup.ml"
# 5946 "setup.ml"
open OASISTypes;;

let setup_t =
Expand Down Expand Up @@ -6315,7 +6318,11 @@ let setup_t =
bs_byteopt = [(OASISExpr.EBool true, [])];
bs_nativeopt = [(OASISExpr.EBool true, [])];
},
{exec_custom = true; exec_main_is = "server_xen.ml"; });
{
exec_custom = true;
exec_main_is = "server_xen.ml";
exec_target = Some "xen";
});
Executable
({
cs_name = "xs_test";
Expand Down Expand Up @@ -6347,7 +6354,11 @@ let setup_t =
bs_byteopt = [(OASISExpr.EBool true, [])];
bs_nativeopt = [(OASISExpr.EBool true, [])];
},
{exec_custom = true; exec_main_is = "xs_test.ml"; });
{
exec_custom = true;
exec_main_is = "xs_test.ml";
exec_target = None;
});
Executable
({
cs_name = "server_test";
Expand Down Expand Up @@ -6381,7 +6392,11 @@ let setup_t =
bs_byteopt = [(OASISExpr.EBool true, [])];
bs_nativeopt = [(OASISExpr.EBool true, [])];
},
{exec_custom = true; exec_main_is = "server_test.ml"; });
{
exec_custom = true;
exec_main_is = "server_test.ml";
exec_target = None;
});
Executable
({
cs_name = "server_unix";
Expand Down Expand Up @@ -6415,7 +6430,11 @@ let setup_t =
bs_byteopt = [(OASISExpr.EBool true, [])];
bs_nativeopt = [(OASISExpr.EBool true, [])];
},
{exec_custom = true; exec_main_is = "server_unix.ml"; });
{
exec_custom = true;
exec_main_is = "server_unix.ml";
exec_target = None;
});
Executable
({
cs_name = "xs";
Expand Down Expand Up @@ -6449,7 +6468,11 @@ let setup_t =
bs_byteopt = [(OASISExpr.EBool true, [])];
bs_nativeopt = [(OASISExpr.EBool true, [])];
},
{exec_custom = true; exec_main_is = "xs_client_cli.ml"; });
{
exec_custom = true;
exec_main_is = "xs_client_cli.ml";
exec_target = None;
});
Executable
({
cs_name = "xsbench";
Expand Down Expand Up @@ -6483,7 +6506,11 @@ let setup_t =
bs_byteopt = [(OASISExpr.EBool true, [])];
bs_nativeopt = [(OASISExpr.EBool true, [])];
},
{exec_custom = true; exec_main_is = "xs_bench.ml"; });
{
exec_custom = true;
exec_main_is = "xs_bench.ml";
exec_target = None;
});
Flag
({
cs_name = "tests";
Expand Down Expand Up @@ -6567,14 +6594,14 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.3.1";
oasis_digest = Some "\b\208\015\017\130^m\014V\159\249E\129\230\170O";
oasis_digest = Some "KN\227\163\242\183\194\225\203\199\029\020\026nyx";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false;
};;

let setup () = BaseSetup.setup setup_t;;

# 6579 "setup.ml"
# 6606 "setup.ml"
(* OASIS_STOP *)
let () = setup ();;

0 comments on commit 59c86cd

Please sign in to comment.