Skip to content
Browse files

bump to version 0.2.0

  • Loading branch information...
1 parent 8c9a63a commit 68eb29d648e121c22942efab3fa821edd72dbce3 @avsm avsm committed Feb 8, 2013
Showing with 141 additions and 193 deletions.
  1. +1 −1 _oasis
  2. +20 −20 _tags
  3. +5 −5 lib/META
  4. +33 −84 myocamlbuild.ml
  5. +82 −83 setup.ml
View
2 _oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.3
Name: shared-memory-ring
-Version: 0.1.0
+Version: 0.2.0
Synopsis: Xen-style shared memory rings
Authors: Anil Madhavapeddy, David Scott
License: ISC
View
40 _tags
@@ -1,5 +1,5 @@
# OASIS_START
-# DO NOT EDIT (digest: 3ddb5c0986b678218a8f74080e69d770)
+# DO NOT EDIT (digest: c284104c791b43b6d3e5b0420e858b0b)
# 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
@@ -35,15 +35,15 @@
<lwt/*.ml{,i}>: pkg_cstruct
<lwt/*.ml{,i}>: pkg_cstruct.syntax
# Executable ring_test
-<lib_test/ring_test.{native,byte,nobj.o}>: use_libring_test_stubs
-<lib_test/ring_test.{native,byte,nobj.o}>: use_xenstore_ring
-<lib_test/ring_test.{native,byte,nobj.o}>: use_console_ring
-<lib_test/ring_test.{native,byte,nobj.o}>: use_shared_memory_ring
-<lib_test/ring_test.{native,byte,nobj.o}>: pkg_lwt
-<lib_test/ring_test.{native,byte,nobj.o}>: pkg_lwt.unix
-<lib_test/ring_test.{native,byte,nobj.o}>: pkg_oUnit
-<lib_test/ring_test.{native,byte,nobj.o}>: pkg_cstruct
-<lib_test/ring_test.{native,byte,nobj.o}>: pkg_cstruct.syntax
+<lib_test/ring_test.{native,byte}>: use_libring_test_stubs
+<lib_test/ring_test.{native,byte}>: use_xenstore_ring
+<lib_test/ring_test.{native,byte}>: use_console_ring
+<lib_test/ring_test.{native,byte}>: use_shared_memory_ring
+<lib_test/ring_test.{native,byte}>: pkg_lwt
+<lib_test/ring_test.{native,byte}>: pkg_lwt.unix
+<lib_test/ring_test.{native,byte}>: pkg_oUnit
+<lib_test/ring_test.{native,byte}>: pkg_cstruct
+<lib_test/ring_test.{native,byte}>: pkg_cstruct.syntax
<lib_test/*.ml{,i}>: use_xenstore_ring
<lib_test/*.ml{,i}>: use_console_ring
<lib_test/*.ml{,i}>: use_shared_memory_ring
@@ -60,16 +60,16 @@
"lib_test/old_ring_stubs.c": pkg_oUnit
"lib_test/old_ring_stubs.c": pkg_cstruct
"lib_test/old_ring_stubs.c": pkg_cstruct.syntax
-<lib_test/ring_test.{native,byte,nobj.o}>: custom
+<lib_test/ring_test.{native,byte}>: custom
# Executable lwt_test
-<lwt_test/lwt_test.{native,byte,nobj.o}>: use_lwt_shared_memory_ring
-<lwt_test/lwt_test.{native,byte,nobj.o}>: use_shared_memory_ring
-<lwt_test/lwt_test.{native,byte,nobj.o}>: pkg_lwt
-<lwt_test/lwt_test.{native,byte,nobj.o}>: pkg_lwt.unix
-<lwt_test/lwt_test.{native,byte,nobj.o}>: pkg_oUnit
-<lwt_test/lwt_test.{native,byte,nobj.o}>: pkg_lwt.syntax
-<lwt_test/lwt_test.{native,byte,nobj.o}>: pkg_cstruct
-<lwt_test/lwt_test.{native,byte,nobj.o}>: pkg_cstruct.syntax
+<lwt_test/lwt_test.{native,byte}>: use_lwt_shared_memory_ring
+<lwt_test/lwt_test.{native,byte}>: use_shared_memory_ring
+<lwt_test/lwt_test.{native,byte}>: pkg_lwt
+<lwt_test/lwt_test.{native,byte}>: pkg_lwt.unix
+<lwt_test/lwt_test.{native,byte}>: pkg_oUnit
+<lwt_test/lwt_test.{native,byte}>: pkg_lwt.syntax
+<lwt_test/lwt_test.{native,byte}>: pkg_cstruct
+<lwt_test/lwt_test.{native,byte}>: pkg_cstruct.syntax
<lwt_test/*.ml{,i}>: use_lwt_shared_memory_ring
<lwt_test/*.ml{,i}>: use_shared_memory_ring
<lwt_test/*.ml{,i}>: pkg_lwt
@@ -78,7 +78,7 @@
<lwt_test/*.ml{,i}>: pkg_lwt.syntax
<lwt_test/*.ml{,i}>: pkg_cstruct
<lwt_test/*.ml{,i}>: pkg_cstruct.syntax
-<lwt_test/lwt_test.{native,byte,nobj.o}>: custom
+<lwt_test/lwt_test.{native,byte}>: custom
# OASIS_STOP
true: annot
<*/*>: syntax_camlp4o
View
10 lib/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: f6889156ddfdcf425806da0219e7b624)
-version = "0.1.0"
+# DO NOT EDIT (digest: 8dd02c0090fe9cda27c2dcc376b5c662)
+version = "0.2.0"
description = "Xen-style shared memory rings"
requires = "cstruct cstruct.syntax"
archive(byte) = "shared_memory_ring.cma"
@@ -9,7 +9,7 @@ archive(native) = "shared_memory_ring.cmxa"
archive(native, plugin) = "shared_memory_ring.cmxs"
exists_if = "shared_memory_ring.cma"
package "xenstore" (
- version = "0.1.0"
+ version = "0.2.0"
description = "Xen-style shared memory rings"
requires = "shared-memory-ring"
archive(byte) = "xenstore_ring.cma"
@@ -20,7 +20,7 @@ package "xenstore" (
)
package "lwt" (
- version = "0.1.0"
+ version = "0.2.0"
description = "Xen-style shared memory rings"
requires = "shared-memory-ring lwt lwt.syntax"
archive(byte) = "lwt_shared_memory_ring.cma"
@@ -31,7 +31,7 @@ package "lwt" (
)
package "console" (
- version = "0.1.0"
+ version = "0.2.0"
description = "Xen-style shared memory rings"
requires = "shared-memory-ring"
archive(byte) = "console_ring.cma"
View
117 myocamlbuild.ml
@@ -1,7 +1,7 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 6db1faea0bf65d85a37c695085f83b25) *)
+(* DO NOT EDIT (digest: fa01762308f97d953e3d7ec39aa4f64f) *)
module OASISGettext = struct
-# 21 "/home/djs/oasis/src/oasis/OASISGettext.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISGettext.ml" *)
let ns_ str =
str
@@ -24,7 +24,7 @@ module OASISGettext = struct
end
module OASISExpr = struct
-# 21 "/home/djs/oasis/src/oasis/OASISExpr.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISExpr.ml" *)
@@ -116,7 +116,7 @@ end
# 117 "myocamlbuild.ml"
module BaseEnvLight = struct
-# 21 "/home/djs/oasis/src/base/BaseEnvLight.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseEnvLight.ml" *)
module MapString = Map.Make(String)
@@ -213,76 +213,8 @@ end
# 215 "myocamlbuild.ml"
-module MyOCamlbuildXen = struct
-# 22 "/home/djs/oasis/src/plugins/ocamlbuild/MyOCamlbuildXen.ml"
-
- open Ocamlbuild_plugin
-
- module Util = struct
- let split s ch =
- let x = ref [] in
- let rec go s =
- let pos = String.index s ch in
- x := (String.before s pos)::!x;
- go (String.after s (pos + 1))
- in
- try
- go s
- with Not_found -> !x
-
- let split_nl s = split s '\n'
- let run_and_read x = List.hd (split_nl (Ocamlbuild_pack.My_unix.run_and_read x))
- end
-
- module Xen = struct
- (** Link to a standalone Xen microkernel *)
- let cc_xen_link bc tags arg out env =
- (* XXX check ocamlfind path here *)
- let xenlib = Util.run_and_read "ocamlfind query mirage" in
- let jmp_obj = Px (xenlib / "longjmp.o") in
- let head_obj = Px (xenlib / "x86_64.o") in
- let ocamllib = match bc with |true -> "ocamlbc" |false -> "ocaml" in
- let ld = getenv ~default:"ld" "LD" in
- let ldlibs = List.map (fun x -> Px (xenlib / ("lib" ^ x ^ ".a")))
- [ocamllib; "xen"; "xencaml"; "diet"; "m"] in
- Cmd (S ( A ld :: [ T(tags++"link"++"xen");
- A"-d"; A"-nostdlib"; A"-m"; A"elf_x86_64"; A"-T";
- Px (xenlib / "mirage-x86_64.lds"); head_obj; P arg ]
- @ ldlibs @ [jmp_obj; A"-o"; Px out]))
-
- let cc_xen_bc_link tags arg out env = cc_xen_link true tags arg out env
- let cc_xen_nc_link tags arg out env = cc_xen_link false tags arg out env
-
- (* Rewrite sections for Xen LDS layout *)
- let xen_objcopy dst src env builder =
- let dst = env dst in
- let src = env src in
- let cmd = ["objcopy";"--rename-section";".bss=.mlbss";"--rename-section";
- ".data=.mldata";"--rename-section";".rodata=.mlrodata";
- "--rename-section";".text=.mltext"] in
- let cmds = List.map (fun x -> A x) cmd in
- Cmd (S (cmds @ [Px src; Px dst]))
-
- let rules () =
- let cc_link_c_implem ?tag fn c o env build =
- let c = env c and o = env o in
- fn (tags_of_pathname c++"implem"+++tag) c o env
- in
- rule "final link: %.nobj.o -> %.xen" ~prod:"%(file).xen" ~dep:"%(file).nobj.o"
- (cc_link_c_implem cc_xen_nc_link "%(file).nobj.o" "%(file).xen")
-
- end
-
- let dispatch =
- function
- | After_rules ->
- Xen.rules ()
- | _ ->
- ()
-end
-
module MyOCamlbuildFindlib = struct
-# 21 "/home/djs/oasis/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
(** OCamlbuild extension, copied from
* http://brion.inria.fr/gallium/index.php/Using_ocamlfind_with_ocamlbuild
@@ -358,11 +290,20 @@ module MyOCamlbuildFindlib = struct
* linking. *)
List.iter
begin fun pkg ->
- flag ["ocaml"; "compile"; "pkg_"^pkg] & S[A"-package"; A pkg];
- flag ["ocaml"; "ocamldep"; "pkg_"^pkg] & S[A"-package"; A pkg];
- flag ["ocaml"; "doc"; "pkg_"^pkg] & S[A"-package"; A pkg];
- flag ["ocaml"; "link"; "pkg_"^pkg] & S[A"-package"; A pkg];
- flag ["ocaml"; "infer_interface"; "pkg_"^pkg] & S[A"-package"; A pkg];
+ let base_args = [A"-package"; A pkg] in
+ let syn_args = [A"-syntax"; A "camlp4o"] in
+ let args =
+ (* heuristic to identify syntax extensions:
+ whether they end in ".syntax"; some might not *)
+ if Filename.check_suffix pkg "syntax"
+ then syn_args @ base_args
+ else base_args
+ in
+ flag ["ocaml"; "compile"; "pkg_"^pkg] & S args;
+ flag ["ocaml"; "ocamldep"; "pkg_"^pkg] & S args;
+ flag ["ocaml"; "doc"; "pkg_"^pkg] & S args;
+ flag ["ocaml"; "link"; "pkg_"^pkg] & S base_args;
+ flag ["ocaml"; "infer_interface"; "pkg_"^pkg] & S args;
end
(find_packages ());
@@ -394,7 +335,7 @@ module MyOCamlbuildFindlib = struct
end
module MyOCamlbuildBase = struct
-# 21 "/home/djs/oasis/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
(** Base functions for writing myocamlbuild.ml
@author Sylvain Le Gall
@@ -410,7 +351,7 @@ module MyOCamlbuildBase = struct
type name = string
type tag = string
-# 56 "/home/djs/oasis/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
+(* # 56 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
type t =
{
@@ -527,11 +468,20 @@ module MyOCamlbuildBase = struct
let native_output_obj x =
OC.link_gen "cmx" "cmxa" !Options.ext_lib [!Options.ext_obj; "cmi"]
OC.ocamlopt_link_prog
- (fun tags -> tags++"ocaml"++"link"++"byte"++"output_obj") x
+ (fun tags -> tags++"ocaml"++"link"++"native"++"output_obj") x
in
rule "ocaml: cmx* and o* -> .nobj.o" ~prod:"%.nobj.o" ~deps:["%.cmx"; "%.o"]
(native_output_obj "%.cmx" "%.nobj.o");
+ (* Add output_obj rules mapped to .bobj.o *)
+ let bytecode_output_obj x =
+ OC.link_gen "cmo" "cma" !Options.ext_lib [!Options.ext_obj; "cmi"]
+ OC.ocamlc_link_prog
+ (fun tags -> tags++"ocaml"++"link"++"byte"++"output_obj") x
+ in
+ rule "ocaml: cmo* -> .nobj.o" ~prod:"%.bobj.o" ~deps:["%.cmo"]
+ (bytecode_output_obj "%.cmo" "%.bobj.o");
+
(* Add flags *)
List.iter
(fun (tags, cond_specs) ->
@@ -548,13 +498,12 @@ module MyOCamlbuildBase = struct
[
dispatch t;
MyOCamlbuildFindlib.dispatch;
- MyOCamlbuildXen.dispatch;
]
end
-# 557 "myocamlbuild.ml"
+# 506 "myocamlbuild.ml"
open Ocamlbuild_plugin;;
let package_default =
{
@@ -589,6 +538,6 @@ let package_default =
let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
-# 593 "myocamlbuild.ml"
+# 542 "myocamlbuild.ml"
(* OASIS_STOP *)
Ocamlbuild_plugin.dispatch dispatch_default;;
View
165 setup.ml
@@ -1,14 +1,14 @@
(* setup.ml generated for the first time by OASIS v0.3.0 *)
(* OASIS_START *)
-(* DO NOT EDIT (digest: 9feb4c8e12f991b22961a8b20af2c69e) *)
+(* DO NOT EDIT (digest: 75901346795ad5335019b0bc3c27080b) *)
(*
Regenerated by OASIS v0.3.1
Visit http://oasis.forge.ocamlcore.org for more information and
documentation about functions used in this file.
*)
module OASISGettext = struct
-# 21 "/home/djs/oasis/src/oasis/OASISGettext.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISGettext.ml" *)
let ns_ str =
str
@@ -31,7 +31,7 @@ module OASISGettext = struct
end
module OASISContext = struct
-# 21 "/home/djs/oasis/src/oasis/OASISContext.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISContext.ml" *)
open OASISGettext
@@ -92,7 +92,7 @@ module OASISContext = struct
end
module OASISString = struct
-# 1 "/home/djs/oasis/src/oasis/OASISString.ml"
+(* # 1 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISString.ml" *)
@@ -217,7 +217,7 @@ module OASISString = struct
end
module OASISUtils = struct
-# 21 "/home/djs/oasis/src/oasis/OASISUtils.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISUtils.ml" *)
open OASISGettext
@@ -312,7 +312,7 @@ module OASISUtils = struct
end
module PropList = struct
-# 21 "/home/djs/oasis/src/oasis/PropList.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/PropList.ml" *)
open OASISGettext
@@ -352,7 +352,7 @@ module PropList = struct
let clear t =
Hashtbl.clear t
-# 71 "/home/djs/oasis/src/oasis/PropList.ml"
+(* # 71 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/PropList.ml" *)
end
module Schema =
@@ -593,7 +593,7 @@ module PropList = struct
end
module OASISMessage = struct
-# 21 "/home/djs/oasis/src/oasis/OASISMessage.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISMessage.ml" *)
open OASISGettext
@@ -632,7 +632,7 @@ module OASISMessage = struct
end
module OASISVersion = struct
-# 21 "/home/djs/oasis/src/oasis/OASISVersion.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISVersion.ml" *)
open OASISGettext
@@ -811,7 +811,7 @@ module OASISVersion = struct
end
module OASISLicense = struct
-# 21 "/home/djs/oasis/src/oasis/OASISLicense.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISLicense.ml" *)
(** License for _oasis fields
@author Sylvain Le Gall
@@ -851,7 +851,7 @@ module OASISLicense = struct
end
module OASISExpr = struct
-# 21 "/home/djs/oasis/src/oasis/OASISExpr.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISExpr.ml" *)
@@ -941,7 +941,7 @@ module OASISExpr = struct
end
module OASISTypes = struct
-# 21 "/home/djs/oasis/src/oasis/OASISTypes.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISTypes.ml" *)
@@ -964,6 +964,8 @@ module OASISTypes = struct
type compiled_object =
| Byte
| Native
+ | Native_object
+ | Bytecode_object
| Best
@@ -1018,7 +1020,7 @@ module OASISTypes = struct
type plugin_data = (all_plugin * plugin_data_purpose * (unit -> unit)) list
-# 102 "/home/djs/oasis/src/oasis/OASISTypes.ml"
+(* # 104 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISTypes.ml" *)
type 'a conditional = 'a OASISExpr.choices
@@ -1077,7 +1079,6 @@ module OASISTypes = struct
{
exec_custom: bool;
exec_main_is: unix_filename;
- exec_target: string option;
}
type flag =
@@ -1185,7 +1186,7 @@ module OASISTypes = struct
end
module OASISUnixPath = struct
-# 21 "/home/djs/oasis/src/oasis/OASISUnixPath.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISUnixPath.ml" *)
type unix_filename = string
type unix_dirname = string
@@ -1269,7 +1270,7 @@ module OASISUnixPath = struct
end
module OASISHostPath = struct
-# 21 "/home/djs/oasis/src/oasis/OASISHostPath.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISHostPath.ml" *)
open Filename
@@ -1302,7 +1303,7 @@ module OASISHostPath = struct
end
module OASISSection = struct
-# 21 "/home/djs/oasis/src/oasis/OASISSection.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISSection.ml" *)
open OASISTypes
@@ -1385,12 +1386,12 @@ module OASISSection = struct
end
module OASISBuildSection = struct
-# 21 "/home/djs/oasis/src/oasis/OASISBuildSection.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISBuildSection.ml" *)
end
module OASISExecutable = struct
-# 21 "/home/djs/oasis/src/oasis/OASISExecutable.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISExecutable.ml" *)
open OASISTypes
@@ -1403,6 +1404,8 @@ module OASISExecutable = struct
let is_native_exec =
match bs.bs_compiled_object with
| Native -> true
+ | Native_object -> false
+ | Bytecode_object -> false
| Best -> is_native ()
| Byte -> false
in
@@ -1421,7 +1424,7 @@ module OASISExecutable = struct
end
module OASISLibrary = struct
-# 21 "/home/djs/oasis/src/oasis/OASISLibrary.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISLibrary.ml" *)
open OASISTypes
open OASISUtils
@@ -1529,6 +1532,8 @@ module OASISLibrary = struct
(not lib.lib_pack) && (* Do not install .cmx packed submodules *)
match bs.bs_compiled_object with
| Native -> true
+ | Native_object -> false
+ | Bytecode_object -> false
| Best -> is_native
| Byte -> false
in
@@ -1566,11 +1571,11 @@ module OASISLibrary = struct
[cs.cs_name^".cmxa"] :: [cs.cs_name^ext_lib] :: acc
in
match bs.bs_compiled_object with
- | Native ->
+ | Native | Native_object ->
byte (native acc_nopath)
| Best when is_native ->
byte (native acc_nopath)
- | Byte | Best ->
+ | Byte | Bytecode_object | Best ->
byte acc_nopath
in
@@ -1599,7 +1604,7 @@ module OASISLibrary = struct
end
module OASISObject = struct
-# 21 "/home/djs/oasis/src/oasis/OASISObject.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISObject.ml" *)
open OASISTypes
open OASISGettext
@@ -1654,17 +1659,17 @@ module OASISObject = struct
in
List.map (List.map f) (
match bs.bs_compiled_object with
- | Native ->
+ | Native | Native_object ->
native :: c_object :: byte :: header :: []
| Best when is_native ->
native :: c_object :: byte :: header :: []
- | Byte | Best ->
+ | Byte | Bytecode_object | Best ->
byte :: header :: [])
end
module OASISFindlib = struct
-# 21 "/home/djs/oasis/src/oasis/OASISFindlib.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISFindlib.ml" *)
open OASISTypes
@@ -1951,32 +1956,32 @@ module OASISFindlib = struct
end
module OASISFlag = struct
-# 21 "/home/djs/oasis/src/oasis/OASISFlag.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISFlag.ml" *)
end
module OASISPackage = struct
-# 21 "/home/djs/oasis/src/oasis/OASISPackage.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISPackage.ml" *)
end
module OASISSourceRepository = struct
-# 21 "/home/djs/oasis/src/oasis/OASISSourceRepository.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISSourceRepository.ml" *)
end
module OASISTest = struct
-# 21 "/home/djs/oasis/src/oasis/OASISTest.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISTest.ml" *)
end
module OASISDocument = struct
-# 21 "/home/djs/oasis/src/oasis/OASISDocument.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISDocument.ml" *)
end
module OASISExec = struct
-# 21 "/home/djs/oasis/src/oasis/OASISExec.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISExec.ml" *)
open OASISGettext
open OASISUtils
@@ -2054,7 +2059,7 @@ module OASISExec = struct
end
module OASISFileUtil = struct
-# 21 "/home/djs/oasis/src/oasis/OASISFileUtil.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISFileUtil.ml" *)
open OASISGettext
@@ -2249,9 +2254,9 @@ module OASISFileUtil = struct
end
-# 2252 "setup.ml"
+# 2257 "setup.ml"
module BaseEnvLight = struct
-# 21 "/home/djs/oasis/src/base/BaseEnvLight.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseEnvLight.ml" *)
module MapString = Map.Make(String)
@@ -2347,9 +2352,9 @@ module BaseEnvLight = struct
end
-# 2350 "setup.ml"
+# 2355 "setup.ml"
module BaseContext = struct
-# 21 "/home/djs/oasis/src/base/BaseContext.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseContext.ml" *)
open OASISContext
@@ -2360,7 +2365,7 @@ module BaseContext = struct
end
module BaseMessage = struct
-# 21 "/home/djs/oasis/src/base/BaseMessage.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseMessage.ml" *)
(** Message to user, overrid for Base
@author Sylvain Le Gall
@@ -2379,7 +2384,7 @@ module BaseMessage = struct
end
module BaseEnv = struct
-# 21 "/home/djs/oasis/src/base/BaseEnv.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseEnv.ml" *)
open OASISGettext
open OASISUtils
@@ -2839,7 +2844,7 @@ module BaseEnv = struct
end
module BaseArgExt = struct
-# 21 "/home/djs/oasis/src/base/BaseArgExt.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseArgExt.ml" *)
open OASISUtils
open OASISGettext
@@ -2867,7 +2872,7 @@ module BaseArgExt = struct
end
module BaseCheck = struct
-# 21 "/home/djs/oasis/src/base/BaseCheck.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseCheck.ml" *)
open BaseEnv
open BaseMessage
@@ -2993,7 +2998,7 @@ module BaseCheck = struct
end
module BaseOCamlcConfig = struct
-# 21 "/home/djs/oasis/src/base/BaseOCamlcConfig.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseOCamlcConfig.ml" *)
open BaseEnv
@@ -3109,7 +3114,7 @@ module BaseOCamlcConfig = struct
end
module BaseStandardVar = struct
-# 21 "/home/djs/oasis/src/base/BaseStandardVar.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseStandardVar.ml" *)
open OASISGettext
@@ -3473,7 +3478,7 @@ module BaseStandardVar = struct
end
module BaseFileAB = struct
-# 21 "/home/djs/oasis/src/base/BaseFileAB.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseFileAB.ml" *)
open BaseEnv
open OASISGettext
@@ -3521,7 +3526,7 @@ module BaseFileAB = struct
end
module BaseLog = struct
-# 21 "/home/djs/oasis/src/base/BaseLog.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseLog.ml" *)
open OASISUtils
@@ -3640,7 +3645,7 @@ module BaseLog = struct
end
module BaseBuilt = struct
-# 21 "/home/djs/oasis/src/base/BaseBuilt.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseBuilt.ml" *)
open OASISTypes
open OASISGettext
@@ -3808,7 +3813,7 @@ module BaseBuilt = struct
end
module BaseCustom = struct
-# 21 "/home/djs/oasis/src/base/BaseCustom.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseCustom.ml" *)
open BaseEnv
open BaseMessage
@@ -3858,7 +3863,7 @@ module BaseCustom = struct
end
module BaseDynVar = struct
-# 21 "/home/djs/oasis/src/base/BaseDynVar.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseDynVar.ml" *)
open OASISTypes
@@ -3905,7 +3910,7 @@ module BaseDynVar = struct
end
module BaseTest = struct
-# 21 "/home/djs/oasis/src/base/BaseTest.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseTest.ml" *)
open BaseEnv
open BaseMessage
@@ -3995,7 +4000,7 @@ module BaseTest = struct
end
module BaseDoc = struct
-# 21 "/home/djs/oasis/src/base/BaseDoc.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseDoc.ml" *)
open BaseEnv
open BaseMessage
@@ -4030,7 +4035,7 @@ module BaseDoc = struct
end
module BaseSetup = struct
-# 21 "/home/djs/oasis/src/base/BaseSetup.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseSetup.ml" *)
open BaseEnv
open BaseMessage
@@ -4609,9 +4614,9 @@ module BaseSetup = struct
end
-# 4612 "setup.ml"
+# 4617 "setup.ml"
module InternalConfigurePlugin = struct
-# 21 "/home/djs/oasis/src/plugins/internal/InternalConfigurePlugin.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/internal/InternalConfigurePlugin.ml" *)
(** Configure using internal scheme
@author Sylvain Le Gall
@@ -4867,7 +4872,7 @@ module InternalConfigurePlugin = struct
end
module InternalInstallPlugin = struct
-# 21 "/home/djs/oasis/src/plugins/internal/InternalInstallPlugin.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/internal/InternalInstallPlugin.ml" *)
(** Install using internal scheme
@author Sylvain Le Gall
@@ -5450,9 +5455,9 @@ module InternalInstallPlugin = struct
end
-# 5453 "setup.ml"
+# 5458 "setup.ml"
module OCamlbuildCommon = struct
-# 21 "/home/djs/oasis/src/plugins/ocamlbuild/OCamlbuildCommon.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/OCamlbuildCommon.ml" *)
(** Functions common to OCamlbuild build and doc plugin
*)
@@ -5554,7 +5559,7 @@ module OCamlbuildCommon = struct
end
module OCamlbuildPlugin = struct
-# 21 "/home/djs/oasis/src/plugins/ocamlbuild/OCamlbuildPlugin.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/OCamlbuildPlugin.ml" *)
(** Build using ocamlbuild
@author Sylvain Le Gall
@@ -5693,15 +5698,17 @@ module OCamlbuildPlugin = struct
(* Add executable *)
let acc =
- match exec.exec_target, bs.bs_compiled_object with
- | Some t, _ ->
- (target ("." ^ t)) :: acc
- | None, Native ->
- (target ".native") :: (target ".nobj.o") :: acc
- | None, Best when bool_of_string (is_native ()) ->
- (target ".native") :: (target ".nobj.o") :: acc
- | None, Byte
- | None, Best ->
+ match bs.bs_compiled_object with
+ | Native_object ->
+ (target ".nobj.o") :: acc
+ | Bytecode_object ->
+ (target ".bobj.o") :: acc
+ | Native ->
+ (target ".native") :: acc
+ | Best when bool_of_string (is_native ()) ->
+ (target ".native") :: acc
+ | Byte
+ | Best ->
(target ".byte") :: acc
in
acc
@@ -5759,7 +5766,7 @@ module OCamlbuildPlugin = struct
end
module OCamlbuildDocPlugin = struct
-# 21 "/home/djs/oasis/src/plugins/ocamlbuild/OCamlbuildDocPlugin.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/OCamlbuildDocPlugin.ml" *)
(* Create documentation using ocamlbuild .odocl files
@author Sylvain Le Gall
@@ -5807,9 +5814,9 @@ module OCamlbuildDocPlugin = struct
end
-# 5810 "setup.ml"
+# 5817 "setup.ml"
module CustomPlugin = struct
-# 21 "/home/djs/oasis/src/plugins/custom/CustomPlugin.ml"
+(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/custom/CustomPlugin.ml" *)
(** Generate custom configure/build/doc/test/install system
@author
@@ -5943,7 +5950,7 @@ module CustomPlugin = struct
end
-# 5946 "setup.ml"
+# 5953 "setup.ml"
open OASISTypes;;
let setup_t =
@@ -6020,7 +6027,7 @@ let setup_t =
ocaml_version = None;
findlib_version = None;
name = "shared-memory-ring";
- version = "0.1.0";
+ version = "0.2.0";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
@@ -6246,11 +6253,7 @@ let setup_t =
bs_byteopt = [(OASISExpr.EBool true, [])];
bs_nativeopt = [(OASISExpr.EBool true, [])];
},
- {
- exec_custom = true;
- exec_main_is = "ring_test.ml";
- exec_target = None;
- });
+ {exec_custom = true; exec_main_is = "ring_test.ml"; });
Executable
({
cs_name = "lwt_test";
@@ -6284,11 +6287,7 @@ let setup_t =
bs_byteopt = [(OASISExpr.EBool true, [])];
bs_nativeopt = [(OASISExpr.EBool true, [])];
},
- {
- exec_custom = true;
- exec_main_is = "lwt_test.ml";
- exec_target = None;
- });
+ {exec_custom = true; exec_main_is = "lwt_test.ml"; });
Test
({
cs_name = "ring_test";
@@ -6350,14 +6349,14 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.3.1";
- oasis_digest = Some "\180ry\213\135[\175\235\159\251&s\156P\183\016";
+ oasis_digest = Some "tk\158?\157\181M[/\223\252\240X\019\254c";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false;
};;
let setup () = BaseSetup.setup setup_t;;
-# 6362 "setup.ml"
+# 6361 "setup.ml"
(* OASIS_STOP *)
let () = setup ();;

0 comments on commit 68eb29d

Please sign in to comment.
Something went wrong with that request. Please try again.