Permalink
Browse files

bump version to 0.3.0

  • Loading branch information...
1 parent ad3a4a5 commit a146bb91994d91bdf858d5b63a556376a3b9e916 David Scott committed Feb 22, 2013
Showing with 131 additions and 420 deletions.
  1. +1 −1 _oasis
  2. +5 −5 lib/META
  3. +26 −56 myocamlbuild.ml
  4. +99 −358 setup.ml
View
2 _oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.3
Name: shared-memory-ring
-Version: 0.2.0
+Version: 0.3.0
Synopsis: Xen-style shared memory rings
Authors: Anil Madhavapeddy, David Scott
License: ISC
View
10 lib/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: 8dd02c0090fe9cda27c2dcc376b5c662)
-version = "0.2.0"
+# DO NOT EDIT (digest: f51ec9bbf3347d0faceb3e16c3efcdcc)
+version = "0.3.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.2.0"
+ version = "0.3.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.2.0"
+ version = "0.3.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.2.0"
+ version = "0.3.0"
description = "Xen-style shared memory rings"
requires = "shared-memory-ring"
archive(byte) = "console_ring.cma"
View
82 myocamlbuild.ml
@@ -1,7 +1,7 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: fa01762308f97d953e3d7ec39aa4f64f) *)
+(* DO NOT EDIT (digest: a51fbcdf3b8d7b71c48da37fc9976961) *)
module OASISGettext = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISGettext.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISGettext.ml" *)
let ns_ str =
str
@@ -24,7 +24,7 @@ module OASISGettext = struct
end
module OASISExpr = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISExpr.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISExpr.ml" *)
@@ -116,7 +116,7 @@ end
# 117 "myocamlbuild.ml"
module BaseEnvLight = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseEnvLight.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseEnvLight.ml" *)
module MapString = Map.Make(String)
@@ -214,7 +214,7 @@ end
# 215 "myocamlbuild.ml"
module MyOCamlbuildFindlib = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
(** OCamlbuild extension, copied from
* http://brion.inria.fr/gallium/index.php/Using_ocamlfind_with_ocamlbuild
@@ -234,21 +234,19 @@ module MyOCamlbuildFindlib = struct
Ocamlbuild_pack.Lexers.blank_sep_strings
let split s ch =
- let buf = Buffer.create 13 in
- let x = ref [] in
- let flush () =
- x := (Buffer.contents buf) :: !x;
- Buffer.clear buf
+ let x =
+ ref []
in
- String.iter
- (fun c ->
- if c = ch then
- flush ()
- else
- Buffer.add_char buf c)
- s;
- flush ();
- List.rev !x
+ 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'
@@ -283,27 +281,17 @@ module MyOCamlbuildFindlib = struct
(* When one link an OCaml library/binary/package, one should use -linkpkg *)
flag ["ocaml"; "link"; "program"] & A"-linkpkg";
- flag ["ocaml"; "link"; "output_obj"] & A"-linkpkg";
(* For each ocamlfind package one inject the -package option when
* compiling, computing dependencies, generating documentation and
* linking. *)
List.iter
begin fun 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;
+ 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];
end
(find_packages ());
@@ -335,7 +323,7 @@ module MyOCamlbuildFindlib = struct
end
module MyOCamlbuildBase = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
(** Base functions for writing myocamlbuild.ml
@author Sylvain Le Gall
@@ -351,7 +339,7 @@ module MyOCamlbuildBase = struct
type name = string
type tag = string
-(* # 56 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
+(* # 56 "/home/djs/.opam/system/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
type t =
{
@@ -464,24 +452,6 @@ module MyOCamlbuildBase = struct
)
t.lib_c;
- (* Add output_obj rules mapped to .nobj.o *)
- 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"++"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) ->
@@ -503,7 +473,7 @@ module MyOCamlbuildBase = struct
end
-# 506 "myocamlbuild.ml"
+# 476 "myocamlbuild.ml"
open Ocamlbuild_plugin;;
let package_default =
{
@@ -538,6 +508,6 @@ let package_default =
let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
-# 542 "myocamlbuild.ml"
+# 512 "myocamlbuild.ml"
(* OASIS_STOP *)
Ocamlbuild_plugin.dispatch dispatch_default;;
View
457 setup.ml
@@ -1,14 +1,14 @@
(* setup.ml generated for the first time by OASIS v0.3.0 *)
(* OASIS_START *)
-(* DO NOT EDIT (digest: 75901346795ad5335019b0bc3c27080b) *)
+(* DO NOT EDIT (digest: c48a3b4c78c0d8c9884b43ba6e27c5b8) *)
(*
- Regenerated by OASIS v0.3.1
+ Regenerated by OASIS v0.3.0
Visit http://oasis.forge.ocamlcore.org for more information and
documentation about functions used in this file.
*)
module OASISGettext = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISGettext.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISGettext.ml" *)
let ns_ str =
str
@@ -31,7 +31,7 @@ module OASISGettext = struct
end
module OASISContext = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISContext.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISContext.ml" *)
open OASISGettext
@@ -92,7 +92,7 @@ module OASISContext = struct
end
module OASISString = struct
-(* # 1 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISString.ml" *)
+(* # 1 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISString.ml" *)
@@ -217,7 +217,7 @@ module OASISString = struct
end
module OASISUtils = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISUtils.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISUtils.ml" *)
open OASISGettext
@@ -312,7 +312,7 @@ module OASISUtils = struct
end
module PropList = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/PropList.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/PropList.ml" *)
open OASISGettext
@@ -352,7 +352,7 @@ module PropList = struct
let clear t =
Hashtbl.clear t
-(* # 71 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/PropList.ml" *)
+(* # 71 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/PropList.ml" *)
end
module Schema =
@@ -593,7 +593,7 @@ module PropList = struct
end
module OASISMessage = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISMessage.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISMessage.ml" *)
open OASISGettext
@@ -632,7 +632,7 @@ module OASISMessage = struct
end
module OASISVersion = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISVersion.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISVersion.ml" *)
open OASISGettext
@@ -811,7 +811,7 @@ module OASISVersion = struct
end
module OASISLicense = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISLicense.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/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/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISExpr.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISExpr.ml" *)
@@ -941,7 +941,7 @@ module OASISExpr = struct
end
module OASISTypes = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISTypes.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISTypes.ml" *)
@@ -964,8 +964,6 @@ module OASISTypes = struct
type compiled_object =
| Byte
| Native
- | Native_object
- | Bytecode_object
| Best
@@ -1020,7 +1018,7 @@ module OASISTypes = struct
type plugin_data = (all_plugin * plugin_data_purpose * (unit -> unit)) list
-(* # 104 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISTypes.ml" *)
+(* # 102 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISTypes.ml" *)
type 'a conditional = 'a OASISExpr.choices
@@ -1068,13 +1066,6 @@ module OASISTypes = struct
lib_findlib_containers: findlib_name list;
}
-
- type object_ =
- {
- obj_modules: string list;
- obj_findlib_fullname: findlib_name list option;
- }
-
type executable =
{
exec_custom: bool;
@@ -1135,7 +1126,6 @@ module OASISTypes = struct
type section =
| Library of common_section * build_section * library
- | Object of common_section * build_section * object_
| Executable of common_section * build_section * executable
| Flag of common_section * flag
| SrcRepo of common_section * source_repository
@@ -1144,7 +1134,7 @@ module OASISTypes = struct
type section_kind =
- [ `Library | `Object | `Executable | `Flag | `SrcRepo | `Test | `Doc ]
+ [ `Library | `Executable | `Flag | `SrcRepo | `Test | `Doc ]
type package =
{
@@ -1186,7 +1176,7 @@ module OASISTypes = struct
end
module OASISUnixPath = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISUnixPath.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISUnixPath.ml" *)
type unix_filename = string
type unix_dirname = string
@@ -1270,7 +1260,7 @@ module OASISUnixPath = struct
end
module OASISHostPath = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISHostPath.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISHostPath.ml" *)
open Filename
@@ -1303,16 +1293,14 @@ module OASISHostPath = struct
end
module OASISSection = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISSection.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISSection.ml" *)
open OASISTypes
let section_kind_common =
function
| Library (cs, _, _) ->
`Library, cs
- | Object (cs, _, _) ->
- `Object, cs
| Executable (cs, _, _) ->
`Executable, cs
| Flag (cs, _) ->
@@ -1330,7 +1318,6 @@ module OASISSection = struct
let section_common_set cs =
function
| Library (_, bs, lib) -> Library (cs, bs, lib)
- | Object (_, bs, obj) -> Object (cs, bs, obj)
| Executable (_, bs, exec) -> Executable (cs, bs, exec)
| Flag (_, flg) -> Flag (cs, flg)
| SrcRepo (_, src_repo) -> SrcRepo (cs, src_repo)
@@ -1351,7 +1338,6 @@ module OASISSection = struct
in
(match k with
| `Library -> "library"
- | `Object -> "object"
| `Executable -> "executable"
| `Flag -> "flag"
| `SrcRepo -> "src repository"
@@ -1386,12 +1372,12 @@ module OASISSection = struct
end
module OASISBuildSection = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISBuildSection.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISBuildSection.ml" *)
end
module OASISExecutable = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISExecutable.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISExecutable.ml" *)
open OASISTypes
@@ -1404,8 +1390,6 @@ 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
@@ -1424,15 +1408,30 @@ module OASISExecutable = struct
end
module OASISLibrary = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISLibrary.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISLibrary.ml" *)
open OASISTypes
open OASISUtils
open OASISGettext
open OASISSection
+ type library_name = name
+ type findlib_part_name = name
+ type 'a map_of_findlib_part_name = 'a OASISUtils.MapString.t
+
+ exception InternalLibraryNotFound of library_name
+ exception FindlibPackageNotFound of findlib_name
+
+ type group_t =
+ | Container of findlib_name * group_t list
+ | Package of (findlib_name *
+ common_section *
+ build_section *
+ library *
+ group_t list)
+
(* Look for a module file, considering capitalization or not. *)
- let find_module source_file_exists bs modul =
+ let find_module source_file_exists (cs, bs, lib) modul =
let possible_base_fn =
List.map
(OASISUnixPath.concat bs.bs_path)
@@ -1473,7 +1472,7 @@ module OASISLibrary = struct
let source_unix_files ~ctxt (cs, bs, lib) source_file_exists =
List.fold_left
(fun acc modul ->
- match find_module source_file_exists bs modul with
+ match find_module source_file_exists (cs, bs, lib) modul with
| `Sources (base_fn, lst) ->
(base_fn, lst) :: acc
| `No_sources _ ->
@@ -1497,7 +1496,7 @@ module OASISLibrary = struct
let find_modules lst ext =
let find_module modul =
- match find_module source_file_exists bs modul with
+ match find_module source_file_exists (cs, bs, lib) modul with
| `Sources (base_fn, _) ->
[base_fn]
| `No_sources lst ->
@@ -1532,8 +1531,6 @@ 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
@@ -1571,11 +1568,11 @@ module OASISLibrary = struct
[cs.cs_name^".cmxa"] :: [cs.cs_name^ext_lib] :: acc
in
match bs.bs_compiled_object with
- | Native | Native_object ->
+ | Native ->
byte (native acc_nopath)
| Best when is_native ->
byte (native acc_nopath)
- | Byte | Bytecode_object | Best ->
+ | Byte | Best ->
byte acc_nopath
in
@@ -1601,100 +1598,7 @@ module OASISLibrary = struct
acc_nopath)
(headers @ cmxs)
-end
-
-module OASISObject = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISObject.ml" *)
-
- open OASISTypes
- open OASISGettext
-
- let source_unix_files ~ctxt (cs, bs, obj) source_file_exists =
- List.fold_left
- (fun acc modul ->
- match OASISLibrary.find_module source_file_exists bs modul with
- | `Sources (base_fn, lst) ->
- (base_fn, lst) :: acc
- | `No_sources _ ->
- OASISMessage.warning
- ~ctxt
- (f_ "Cannot find source file matching \
- module '%s' in object %s")
- modul cs.cs_name;
- acc)
- []
- obj.obj_modules
-
-
- let generated_unix_files
- ~ctxt
- ~is_native
- ~source_file_exists
- (cs, bs, obj) =
-
- let find_module ext modul =
- match OASISLibrary.find_module source_file_exists bs modul with
- | `Sources (base_fn, _) -> [base_fn ^ ext]
- | `No_sources lst ->
- OASISMessage.warning
- ~ctxt
- (f_ "Cannot find source file matching \
- module '%s' in object %s")
- modul cs.cs_name ;
- lst
- in
-
- let header, byte, native, c_object, f =
- match obj.obj_modules with
- | [ m ] -> (find_module ".cmi" m,
- find_module ".cmo" m,
- find_module ".cmx" m,
- find_module ".o" m,
- fun x -> x)
- | _ -> ([cs.cs_name ^ ".cmi"],
- [cs.cs_name ^ ".cmo"],
- [cs.cs_name ^ ".cmx"],
- [cs.cs_name ^ ".o"],
- OASISUnixPath.concat bs.bs_path)
- in
- List.map (List.map f) (
- match bs.bs_compiled_object with
- | Native | Native_object ->
- native :: c_object :: byte :: header :: []
- | Best when is_native ->
- native :: c_object :: byte :: header :: []
- | Byte | Bytecode_object | Best ->
- byte :: header :: [])
-
-end
-
-module OASISFindlib = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISFindlib.ml" *)
-
-
- open OASISTypes
- open OASISUtils
- open OASISGettext
- open OASISSection
-
- type library_name = name
- type findlib_part_name = name
- type 'a map_of_findlib_part_name = 'a OASISUtils.MapString.t
-
- exception InternalLibraryNotFound of library_name
- exception FindlibPackageNotFound of findlib_name
-
- type group_t =
- | Container of findlib_name * group_t list
- | Package of (findlib_name *
- common_section *
- build_section *
- [`Library of library | `Object of object_] *
- group_t list)
-
- type data = common_section *
- build_section *
- [`Library of library | `Object of object_]
+ type data = common_section * build_section * library
type tree =
| Node of (data option) * (tree MapString.t)
| Leaf of data
@@ -1737,23 +1641,6 @@ module OASISFindlib = struct
mp
end
- | Object (cs, _, obj) ->
- begin
- let obj_name = cs.cs_name in
- if MapString.mem obj_name mp then
- failwithf
- (f_ "The object name '%s' is used more than once.")
- obj_name;
- let findlib_full_name = match obj.obj_findlib_fullname with
- | Some ns -> String.concat "." ns
- | None -> obj_name
- in
- MapString.add
- obj_name
- (`Solved findlib_full_name)
- mp
- end
-
| Executable _ | Test _ | Flag _ | SrcRepo _ | Doc _ ->
mp)
MapString.empty
@@ -1891,9 +1778,7 @@ module OASISFindlib = struct
(fun mp ->
function
| Library (cs, bs, lib) ->
- add (cs, bs, `Library lib) mp
- | Object (cs, bs, obj) ->
- add (cs, bs, `Object obj) mp
+ add (cs, bs, lib) mp
| _ ->
mp)
MapString.empty
@@ -1956,32 +1841,32 @@ module OASISFindlib = struct
end
module OASISFlag = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISFlag.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISFlag.ml" *)
end
module OASISPackage = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISPackage.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISPackage.ml" *)
end
module OASISSourceRepository = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISSourceRepository.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISSourceRepository.ml" *)
end
module OASISTest = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISTest.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISTest.ml" *)
end
module OASISDocument = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISDocument.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISDocument.ml" *)
end
module OASISExec = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISExec.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISExec.ml" *)
open OASISGettext
open OASISUtils
@@ -2059,7 +1944,7 @@ module OASISExec = struct
end
module OASISFileUtil = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISFileUtil.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISFileUtil.ml" *)
open OASISGettext
@@ -2254,9 +2139,9 @@ module OASISFileUtil = struct
end
-# 2257 "setup.ml"
+# 2142 "setup.ml"
module BaseEnvLight = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseEnvLight.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseEnvLight.ml" *)
module MapString = Map.Make(String)
@@ -2352,9 +2237,9 @@ module BaseEnvLight = struct
end
-# 2355 "setup.ml"
+# 2240 "setup.ml"
module BaseContext = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseContext.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseContext.ml" *)
open OASISContext
@@ -2365,7 +2250,7 @@ module BaseContext = struct
end
module BaseMessage = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseMessage.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseMessage.ml" *)
(** Message to user, overrid for Base
@author Sylvain Le Gall
@@ -2384,7 +2269,7 @@ module BaseMessage = struct
end
module BaseEnv = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseEnv.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseEnv.ml" *)
open OASISGettext
open OASISUtils
@@ -2844,7 +2729,7 @@ module BaseEnv = struct
end
module BaseArgExt = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseArgExt.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseArgExt.ml" *)
open OASISUtils
open OASISGettext
@@ -2872,7 +2757,7 @@ module BaseArgExt = struct
end
module BaseCheck = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseCheck.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseCheck.ml" *)
open BaseEnv
open BaseMessage
@@ -2998,7 +2883,7 @@ module BaseCheck = struct
end
module BaseOCamlcConfig = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseOCamlcConfig.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseOCamlcConfig.ml" *)
open BaseEnv
@@ -3114,7 +2999,7 @@ module BaseOCamlcConfig = struct
end
module BaseStandardVar = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseStandardVar.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseStandardVar.ml" *)
open OASISGettext
@@ -3478,7 +3363,7 @@ module BaseStandardVar = struct
end
module BaseFileAB = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseFileAB.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseFileAB.ml" *)
open BaseEnv
open OASISGettext
@@ -3526,7 +3411,7 @@ module BaseFileAB = struct
end
module BaseLog = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseLog.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseLog.ml" *)
open OASISUtils
@@ -3645,7 +3530,7 @@ module BaseLog = struct
end
module BaseBuilt = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseBuilt.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseBuilt.ml" *)
open OASISTypes
open OASISGettext
@@ -3656,7 +3541,6 @@ module BaseBuilt = struct
| BExec (* Executable *)
| BExecLib (* Library coming with executable *)
| BLib (* Library *)
- | BObj (* Library *)
| BDoc (* Document *)
let to_log_event_file t nm =
@@ -3665,7 +3549,6 @@ module BaseBuilt = struct
| BExec -> "exec"
| BExecLib -> "exec_lib"
| BLib -> "lib"
- | BObj -> "obj"
| BDoc -> "doc")^
"_"^nm
@@ -3729,8 +3612,6 @@ module BaseBuilt = struct
(f_ "executable %s")
| BLib ->
(f_ "library %s")
- | BObj ->
- (f_ "object %s")
| BDoc ->
(f_ "documentation %s"))
nm);
@@ -3793,27 +3674,10 @@ module BaseBuilt = struct
in
evs, unix_lst
-
- let of_object ffn (cs, bs, obj) =
- let unix_lst =
- OASISObject.generated_unix_files
- ~ctxt:!BaseContext.default
- ~source_file_exists:(fun fn ->
- OASISFileUtil.file_exists_case (OASISHostPath.of_unix fn))
- ~is_native:(bool_of_string (is_native ()))
- (cs, bs, obj)
- in
- let evs =
- [BObj,
- cs.cs_name,
- List.map (List.map ffn) unix_lst]
- in
- evs, unix_lst
-
end
module BaseCustom = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseCustom.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseCustom.ml" *)
open BaseEnv
open BaseMessage
@@ -3863,7 +3727,7 @@ module BaseCustom = struct
end
module BaseDynVar = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseDynVar.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseDynVar.ml" *)
open OASISTypes
@@ -3904,13 +3768,13 @@ module BaseDynVar = struct
(f_ "Executable '%s' not yet built.")
cs.cs_name)))))
- | Library _ | Object _ | Flag _ | Test _ | SrcRepo _ | Doc _ ->
+ | Library _ | Flag _ | Test _ | SrcRepo _ | Doc _ ->
())
pkg.sections
end
module BaseTest = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseTest.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseTest.ml" *)
open BaseEnv
open BaseMessage
@@ -4000,7 +3864,7 @@ module BaseTest = struct
end
module BaseDoc = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseDoc.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseDoc.ml" *)
open BaseEnv
open BaseMessage
@@ -4035,7 +3899,7 @@ module BaseDoc = struct
end
module BaseSetup = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseSetup.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseSetup.ml" *)
open BaseEnv
open BaseMessage
@@ -4282,7 +4146,6 @@ module BaseSetup = struct
(f t.package (cs, doc))
args
| Library _
- | Object _
| Executable _
| Flag _
| SrcRepo _ ->
@@ -4614,9 +4477,9 @@ module BaseSetup = struct
end
-# 4617 "setup.ml"
+# 4480 "setup.ml"
module InternalConfigurePlugin = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/internal/InternalConfigurePlugin.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/plugins/internal/InternalConfigurePlugin.ml" *)
(** Configure using internal scheme
@author Sylvain Le Gall
@@ -4793,20 +4656,6 @@ module InternalConfigurePlugin = struct
| None ->
()
end;
- (* Make sure the findlib version is fine for the OCaml compiler. *)
- begin
- let ocaml_ge4 =
- OASISVersion.version_compare
- (OASISVersion.version_of_string (BaseStandardVar.ocaml_version()))
- (OASISVersion.version_of_string "4.0.0") >= 0 in
- if ocaml_ge4 then
- let findlib_lt132 =
- OASISVersion.version_compare
- (OASISVersion.version_of_string (BaseStandardVar.findlib_version()))
- (OASISVersion.version_of_string "1.3.2") < 0 in
- if findlib_lt132 then
- add_errors "OCaml >= 4.0.0 requires Findlib version >= 1.3.2"
- end;
(* FlexDLL *)
if BaseStandardVar.os_type () = "Win32" ||
@@ -4872,7 +4721,7 @@ module InternalConfigurePlugin = struct
end
module InternalInstallPlugin = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/internal/InternalInstallPlugin.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/plugins/internal/InternalInstallPlugin.ml" *)
(** Install using internal scheme
@author Sylvain Le Gall
@@ -4882,7 +4731,7 @@ module InternalInstallPlugin = struct
open BaseStandardVar
open BaseMessage
open OASISTypes
- open OASISFindlib
+ open OASISLibrary
open OASISGettext
open OASISUtils
@@ -4892,9 +4741,6 @@ module InternalInstallPlugin = struct
let lib_hook =
ref (fun (cs, bs, lib) -> cs, bs, lib, [])
- let obj_hook =
- ref (fun (cs, bs, obj) -> cs, bs, obj, [])
-
let doc_hook =
ref (fun (cs, doc) -> cs, doc)
@@ -5115,75 +4961,6 @@ module InternalInstallPlugin = struct
begin
(f_data, acc)
end
- and files_of_object (f_data, acc) data_obj =
- let cs, bs, obj, obj_extra =
- !obj_hook data_obj
- in
- if var_choose bs.bs_install &&
- BaseBuilt.is_built BaseBuilt.BObj cs.cs_name then
- begin
- let acc =
- (* Start with acc + obj_extra *)
- List.rev_append obj_extra acc
- in
- let acc =
- (* Add uncompiled header from the source tree *)
- let path =
- OASISHostPath.of_unix bs.bs_path
- in
- List.fold_left
- (fun acc modul ->
- try
- List.find
- OASISFileUtil.file_exists_case
- (List.map
- (Filename.concat path)
- [modul^".mli";
- modul^".ml";
- String.uncapitalize modul^".mli";
- String.capitalize modul^".mli";
- String.uncapitalize modul^".ml";
- String.capitalize modul^".ml"])
- :: acc
- with Not_found ->
- begin
- warning
- (f_ "Cannot find source header for module %s \
- in object %s")
- modul cs.cs_name;
- acc
- end)
- acc
- obj.obj_modules
- in
-
- let acc =
- (* Get generated files *)
- BaseBuilt.fold
- BaseBuilt.BObj
- cs.cs_name
- (fun acc fn -> fn :: acc)
- acc
- in
-
- let f_data () =
- (* Install data associated with the object *)
- install_data
- bs.bs_path
- bs.bs_data_files
- (Filename.concat
- (datarootdir ())
- pkg.name);
- f_data ()
- in
-
- (f_data, acc)
- end
- else
- begin
- (f_data, acc)
- end
-
in
(* Install one group of library *)
@@ -5194,10 +4971,8 @@ module InternalInstallPlugin = struct
match grp with
| Container (_, children) ->
data_and_files, children
- | Package (_, cs, bs, `Library lib, children) ->
+ | Package (_, cs, bs, lib, children) ->
files_of_library data_and_files (cs, bs, lib), children
- | Package (_, cs, bs, `Object obj, children) ->
- files_of_object data_and_files (cs, bs, obj), children
in
List.fold_left
install_group_lib_aux
@@ -5455,9 +5230,9 @@ module InternalInstallPlugin = struct
end
-# 5458 "setup.ml"
+# 5233 "setup.ml"
module OCamlbuildCommon = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/OCamlbuildCommon.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/plugins/ocamlbuild/OCamlbuildCommon.ml" *)
(** Functions common to OCamlbuild build and doc plugin
*)
@@ -5559,7 +5334,7 @@ module OCamlbuildCommon = struct
end
module OCamlbuildPlugin = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/OCamlbuildPlugin.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/plugins/ocamlbuild/OCamlbuildPlugin.ml" *)
(** Build using ocamlbuild
@author Sylvain Le Gall
@@ -5590,19 +5365,6 @@ module OCamlbuildPlugin = struct
in_build_dir (OASISHostPath.of_unix fn)
in
- (* Checks if the string [fn] ends with [nd] *)
- let ends_with nd fn =
- let nd_len =
- String.length nd
- in
- (String.length fn >= nd_len)
- &&
- (String.sub
- fn
- (String.length fn - nd_len)
- nd_len) = nd
- in
-
let cond_targets =
List.fold_left
(fun acc ->
@@ -5615,6 +5377,18 @@ module OCamlbuildPlugin = struct
(cs, bs, lib)
in
+ let ends_with nd fn =
+ let nd_len =
+ String.length nd
+ in
+ (String.length fn >= nd_len)
+ &&
+ (String.sub
+ fn
+ (String.length fn - nd_len)
+ nd_len) = nd
+ in
+
let tgts =
List.flatten
(List.filter
@@ -5639,35 +5413,6 @@ module OCamlbuildPlugin = struct
cs.cs_name
end
- | Object (cs, bs, obj) when var_choose bs.bs_build ->
- begin
- let evs, unix_files =
- BaseBuilt.of_object
- in_build_dir_of_unix
- (cs, bs, obj)
- in
-
- let tgts =
- List.flatten
- (List.filter
- (fun l -> l <> [])
- (List.map
- (List.filter
- (fun fn ->
- ends_with ".cmo" fn
- || ends_with ".cmx" fn))
- unix_files))
- in
-
- match tgts with
- | _ :: _ ->
- (evs, tgts) :: acc
- | [] ->
- failwithf
- (f_ "No possible ocamlbuild targets for object %s")
- cs.cs_name
- end
-
| Executable (cs, bs, exec) when var_choose bs.bs_build ->
begin
let evs, unix_exec_is, unix_dll_opt =
@@ -5699,12 +5444,8 @@ module OCamlbuildPlugin = struct
(* Add executable *)
let acc =
match bs.bs_compiled_object with
- | Native_object ->
- (target ".nobj.o") :: acc
- | Bytecode_object ->
- (target ".bobj.o") :: acc
| Native ->
- (target ".native") :: acc
+ (target ".native") :: acc
| Best when bool_of_string (is_native ()) ->
(target ".native") :: acc
| Byte
@@ -5714,7 +5455,7 @@ module OCamlbuildPlugin = struct
acc
end
- | Library _ | Object _ | Executable _ | Test _
+ | Library _ | Executable _ | Test _
| SrcRepo _ | Flag _ | Doc _ ->
acc)
[]
@@ -5766,7 +5507,7 @@ module OCamlbuildPlugin = struct
end
module OCamlbuildDocPlugin = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/OCamlbuildDocPlugin.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/plugins/ocamlbuild/OCamlbuildDocPlugin.ml" *)
(* Create documentation using ocamlbuild .odocl files
@author Sylvain Le Gall
@@ -5814,9 +5555,9 @@ module OCamlbuildDocPlugin = struct
end
-# 5817 "setup.ml"
+# 5558 "setup.ml"
module CustomPlugin = struct
-(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/custom/CustomPlugin.ml" *)
+(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/plugins/custom/CustomPlugin.ml" *)
(** Generate custom configure/build/doc/test/install system
@author
@@ -5950,7 +5691,7 @@ module CustomPlugin = struct
end
-# 5953 "setup.ml"
+# 5694 "setup.ml"
open OASISTypes;;
let setup_t =
@@ -6027,7 +5768,7 @@ let setup_t =
ocaml_version = None;
findlib_version = None;
name = "shared-memory-ring";
- version = "0.2.0";
+ version = "0.3.0";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
@@ -6348,15 +6089,15 @@ let setup_t =
plugin_data = [];
};
oasis_fn = Some "_oasis";
- oasis_version = "0.3.1";
- oasis_digest = Some "tk\158?\157\181M[/\223\252\240X\019\254c";
+ oasis_version = "0.3.0";
+ oasis_digest = Some "\249\173\127Q\182H\1338>\187\155>\156\250\016\158";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false;
};;
let setup () = BaseSetup.setup setup_t;;
-# 6361 "setup.ml"
+# 6102 "setup.ml"
(* OASIS_STOP *)
let () = setup ();;

0 comments on commit a146bb9

Please sign in to comment.