Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Require Lwt 2.4.6 as 2.4.7 breaks socketpair

  • Loading branch information...
commit 636cbff10d37c34e8ca33e0fbed7dc6f1f4d803e 1 parent 49909fb
Andre Nathan authored
Showing with 386 additions and 295 deletions.
  1. +10 −2 _oasis
  2. +72 −61 _tags
  3. +1 −3 lib/lwt/release_lwt.ml
  4. +66 −52 myocamlbuild.ml
  5. +237 −177 setup.ml
12 _oasis
View
@@ -62,8 +62,8 @@ Library "release-lwt"
FindlibName: lwt
FindlibParent: release
Path: lib/lwt
- BuildDepends: lwt (>= 2.4.7),
- lwt.unix (>= 2.4.7),
+ BuildDepends: lwt (= 2.4.6),
+ lwt.unix (= 2.4.6),
release
CompiledObject: best
Modules: Release_lwt
@@ -140,6 +140,14 @@ Executable "lwt_test_helper"
BuildDepends: release.lwt,
str
+Executable "lwt_test_worker"
+ Path: lib_test/lwt
+ MainIs: worker.ml
+ Install: false
+ CompiledObject: best
+ BuildDepends: release.lwt,
+ str
+
Executable "lwt_masterctl"
Path: lib_test/lwt
MainIs: masterctl.ml
133 _tags
View
@@ -1,8 +1,9 @@
# OASIS_START
-# DO NOT EDIT (digest: fc08507f0b487807fc06dff2f59ebee2)
+# DO NOT EDIT (digest: 690a6307b84edd6011d308183ef98a1d)
# 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
+true: annot, bin_annot
<**/.svn>: -traverse
<**/.svn>: not_hygienic
".bzr": -traverse
@@ -15,32 +16,32 @@
"_darcs": not_hygienic
# Library release
"lib/release/release.cmxs": use_release
-<lib/release/*.ml{,i}>: pkg_str
-<lib/release/*.ml{,i}>: pkg_uint.uint128
-<lib/release/*.ml{,i}>: pkg_uint.uint32
-<lib/release/*.ml{,i}>: pkg_uint.uint64
-<lib/release/*.ml{,i}>: pkg_unix
+<lib/release/*.ml{,i,y}>: pkg_str
+<lib/release/*.ml{,i,y}>: pkg_uint.uint128
+<lib/release/*.ml{,i,y}>: pkg_uint.uint32
+<lib/release/*.ml{,i,y}>: pkg_uint.uint64
+<lib/release/*.ml{,i,y}>: pkg_unix
# Library release-async
"lib/async/release-async.cmxs": use_release-async
-<lib/async/*.ml{,i}>: pkg_async
-<lib/async/*.ml{,i}>: pkg_async_extended
-<lib/async/*.ml{,i}>: pkg_str
-<lib/async/*.ml{,i}>: pkg_threads
-<lib/async/*.ml{,i}>: pkg_uint.uint128
-<lib/async/*.ml{,i}>: pkg_uint.uint32
-<lib/async/*.ml{,i}>: pkg_uint.uint64
-<lib/async/*.ml{,i}>: pkg_unix
-<lib/async/*.ml{,i}>: use_release
+<lib/async/*.ml{,i,y}>: pkg_async
+<lib/async/*.ml{,i,y}>: pkg_async_extended
+<lib/async/*.ml{,i,y}>: pkg_str
+<lib/async/*.ml{,i,y}>: pkg_threads
+<lib/async/*.ml{,i,y}>: pkg_uint.uint128
+<lib/async/*.ml{,i,y}>: pkg_uint.uint32
+<lib/async/*.ml{,i,y}>: pkg_uint.uint64
+<lib/async/*.ml{,i,y}>: pkg_unix
+<lib/async/*.ml{,i,y}>: use_release
# Library release-lwt
"lib/lwt/release-lwt.cmxs": use_release-lwt
-<lib/lwt/*.ml{,i}>: pkg_lwt
-<lib/lwt/*.ml{,i}>: pkg_lwt.unix
-<lib/lwt/*.ml{,i}>: pkg_str
-<lib/lwt/*.ml{,i}>: pkg_uint.uint128
-<lib/lwt/*.ml{,i}>: pkg_uint.uint32
-<lib/lwt/*.ml{,i}>: pkg_uint.uint64
-<lib/lwt/*.ml{,i}>: pkg_unix
-<lib/lwt/*.ml{,i}>: use_release
+<lib/lwt/*.ml{,i,y}>: pkg_lwt
+<lib/lwt/*.ml{,i,y}>: pkg_lwt.unix
+<lib/lwt/*.ml{,i,y}>: pkg_str
+<lib/lwt/*.ml{,i,y}>: pkg_uint.uint128
+<lib/lwt/*.ml{,i,y}>: pkg_uint.uint32
+<lib/lwt/*.ml{,i,y}>: pkg_uint.uint64
+<lib/lwt/*.ml{,i,y}>: pkg_unix
+<lib/lwt/*.ml{,i,y}>: use_release
# Executable async_test_master
<lib_test/async/master.{native,byte}>: pkg_async
<lib_test/async/master.{native,byte}>: pkg_async_extended
@@ -85,16 +86,16 @@
<lib_test/async/masterctl.{native,byte}>: pkg_unix
<lib_test/async/masterctl.{native,byte}>: use_release
<lib_test/async/masterctl.{native,byte}>: use_release-async
-<lib_test/async/*.ml{,i}>: pkg_async
-<lib_test/async/*.ml{,i}>: pkg_async_extended
-<lib_test/async/*.ml{,i}>: pkg_str
-<lib_test/async/*.ml{,i}>: pkg_threads
-<lib_test/async/*.ml{,i}>: pkg_uint.uint128
-<lib_test/async/*.ml{,i}>: pkg_uint.uint32
-<lib_test/async/*.ml{,i}>: pkg_uint.uint64
-<lib_test/async/*.ml{,i}>: pkg_unix
-<lib_test/async/*.ml{,i}>: use_release
-<lib_test/async/*.ml{,i}>: use_release-async
+<lib_test/async/*.ml{,i,y}>: pkg_async
+<lib_test/async/*.ml{,i,y}>: pkg_async_extended
+<lib_test/async/*.ml{,i,y}>: pkg_str
+<lib_test/async/*.ml{,i,y}>: pkg_threads
+<lib_test/async/*.ml{,i,y}>: pkg_uint.uint128
+<lib_test/async/*.ml{,i,y}>: pkg_uint.uint32
+<lib_test/async/*.ml{,i,y}>: pkg_uint.uint64
+<lib_test/async/*.ml{,i,y}>: pkg_unix
+<lib_test/async/*.ml{,i,y}>: use_release
+<lib_test/async/*.ml{,i,y}>: use_release-async
# Executable async_test_config
<lib_test/async/config/config_test.{native,byte}>: pkg_async
<lib_test/async/config/config_test.{native,byte}>: pkg_async_extended
@@ -106,16 +107,16 @@
<lib_test/async/config/config_test.{native,byte}>: pkg_unix
<lib_test/async/config/config_test.{native,byte}>: use_release
<lib_test/async/config/config_test.{native,byte}>: use_release-async
-<lib_test/async/config/*.ml{,i}>: pkg_async
-<lib_test/async/config/*.ml{,i}>: pkg_async_extended
-<lib_test/async/config/*.ml{,i}>: pkg_str
-<lib_test/async/config/*.ml{,i}>: pkg_threads
-<lib_test/async/config/*.ml{,i}>: pkg_uint.uint128
-<lib_test/async/config/*.ml{,i}>: pkg_uint.uint32
-<lib_test/async/config/*.ml{,i}>: pkg_uint.uint64
-<lib_test/async/config/*.ml{,i}>: pkg_unix
-<lib_test/async/config/*.ml{,i}>: use_release
-<lib_test/async/config/*.ml{,i}>: use_release-async
+<lib_test/async/config/*.ml{,i,y}>: pkg_async
+<lib_test/async/config/*.ml{,i,y}>: pkg_async_extended
+<lib_test/async/config/*.ml{,i,y}>: pkg_str
+<lib_test/async/config/*.ml{,i,y}>: pkg_threads
+<lib_test/async/config/*.ml{,i,y}>: pkg_uint.uint128
+<lib_test/async/config/*.ml{,i,y}>: pkg_uint.uint32
+<lib_test/async/config/*.ml{,i,y}>: pkg_uint.uint64
+<lib_test/async/config/*.ml{,i,y}>: pkg_unix
+<lib_test/async/config/*.ml{,i,y}>: use_release
+<lib_test/async/config/*.ml{,i,y}>: use_release-async
# Executable lwt_test_master
<lib_test/lwt/master.{native,byte}>: pkg_lwt
<lib_test/lwt/master.{native,byte}>: pkg_lwt.unix
@@ -146,6 +147,16 @@
<lib_test/lwt/helper.{native,byte}>: pkg_unix
<lib_test/lwt/helper.{native,byte}>: use_release
<lib_test/lwt/helper.{native,byte}>: use_release-lwt
+# Executable lwt_test_worker
+<lib_test/lwt/worker.{native,byte}>: pkg_lwt
+<lib_test/lwt/worker.{native,byte}>: pkg_lwt.unix
+<lib_test/lwt/worker.{native,byte}>: pkg_str
+<lib_test/lwt/worker.{native,byte}>: pkg_uint.uint128
+<lib_test/lwt/worker.{native,byte}>: pkg_uint.uint32
+<lib_test/lwt/worker.{native,byte}>: pkg_uint.uint64
+<lib_test/lwt/worker.{native,byte}>: pkg_unix
+<lib_test/lwt/worker.{native,byte}>: use_release
+<lib_test/lwt/worker.{native,byte}>: use_release-lwt
# Executable lwt_masterctl
<lib_test/lwt/masterctl.{native,byte}>: pkg_lwt
<lib_test/lwt/masterctl.{native,byte}>: pkg_lwt.unix
@@ -156,15 +167,15 @@
<lib_test/lwt/masterctl.{native,byte}>: pkg_unix
<lib_test/lwt/masterctl.{native,byte}>: use_release
<lib_test/lwt/masterctl.{native,byte}>: use_release-lwt
-<lib_test/lwt/*.ml{,i}>: pkg_lwt
-<lib_test/lwt/*.ml{,i}>: pkg_lwt.unix
-<lib_test/lwt/*.ml{,i}>: pkg_str
-<lib_test/lwt/*.ml{,i}>: pkg_uint.uint128
-<lib_test/lwt/*.ml{,i}>: pkg_uint.uint32
-<lib_test/lwt/*.ml{,i}>: pkg_uint.uint64
-<lib_test/lwt/*.ml{,i}>: pkg_unix
-<lib_test/lwt/*.ml{,i}>: use_release
-<lib_test/lwt/*.ml{,i}>: use_release-lwt
+<lib_test/lwt/*.ml{,i,y}>: pkg_lwt
+<lib_test/lwt/*.ml{,i,y}>: pkg_lwt.unix
+<lib_test/lwt/*.ml{,i,y}>: pkg_str
+<lib_test/lwt/*.ml{,i,y}>: pkg_uint.uint128
+<lib_test/lwt/*.ml{,i,y}>: pkg_uint.uint32
+<lib_test/lwt/*.ml{,i,y}>: pkg_uint.uint64
+<lib_test/lwt/*.ml{,i,y}>: pkg_unix
+<lib_test/lwt/*.ml{,i,y}>: use_release
+<lib_test/lwt/*.ml{,i,y}>: use_release-lwt
# Executable lwt_test_config
<lib_test/lwt/config/config_test.{native,byte}>: pkg_lwt
<lib_test/lwt/config/config_test.{native,byte}>: pkg_lwt.unix
@@ -175,15 +186,15 @@
<lib_test/lwt/config/config_test.{native,byte}>: pkg_unix
<lib_test/lwt/config/config_test.{native,byte}>: use_release
<lib_test/lwt/config/config_test.{native,byte}>: use_release-lwt
-<lib_test/lwt/config/*.ml{,i}>: pkg_lwt
-<lib_test/lwt/config/*.ml{,i}>: pkg_lwt.unix
-<lib_test/lwt/config/*.ml{,i}>: pkg_str
-<lib_test/lwt/config/*.ml{,i}>: pkg_uint.uint128
-<lib_test/lwt/config/*.ml{,i}>: pkg_uint.uint32
-<lib_test/lwt/config/*.ml{,i}>: pkg_uint.uint64
-<lib_test/lwt/config/*.ml{,i}>: pkg_unix
-<lib_test/lwt/config/*.ml{,i}>: use_release
-<lib_test/lwt/config/*.ml{,i}>: use_release-lwt
+<lib_test/lwt/config/*.ml{,i,y}>: pkg_lwt
+<lib_test/lwt/config/*.ml{,i,y}>: pkg_lwt.unix
+<lib_test/lwt/config/*.ml{,i,y}>: pkg_str
+<lib_test/lwt/config/*.ml{,i,y}>: pkg_uint.uint128
+<lib_test/lwt/config/*.ml{,i,y}>: pkg_uint.uint32
+<lib_test/lwt/config/*.ml{,i,y}>: pkg_uint.uint64
+<lib_test/lwt/config/*.ml{,i,y}>: pkg_unix
+<lib_test/lwt/config/*.ml{,i,y}>: use_release
+<lib_test/lwt/config/*.ml{,i,y}>: use_release-lwt
# OASIS_STOP
<lib/option/*.ml>: annot
<lib/option/*.ml>: warn_error_A
4 lib/lwt/release_lwt.ml
View
@@ -120,9 +120,7 @@ struct
type t = Lwt_bytes.t
let blit = Lwt_bytes.blit
- let blit_string_bytes src src_pos dst dst_pos len =
- let b = Bytes.of_string src in
- Lwt_bytes.blit_from_bytes b src_pos dst dst_pos len
+ let blit_string_bytes = Lwt_bytes.blit_string_bytes
let create = Lwt_bytes.create
let fill = Lwt_bytes.fill
let get = Lwt_bytes.get
118 myocamlbuild.ml
View
@@ -1,7 +1,7 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 31bfa2da43061fc20c2a1712db0a11bf) *)
+(* DO NOT EDIT (digest: 86e024a67a1fb2bc4a26b080ccc6740e) *)
module OASISGettext = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISGettext.ml" *)
+(* # 22 "src/oasis/OASISGettext.ml" *)
let ns_ str =
@@ -30,7 +30,7 @@ module OASISGettext = struct
end
module OASISExpr = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISExpr.ml" *)
+(* # 22 "src/oasis/OASISExpr.ml" *)
@@ -39,10 +39,10 @@ module OASISExpr = struct
open OASISGettext
- type test = string
+ type test = string
- type flag = string
+ type flag = string
type t =
@@ -52,10 +52,10 @@ module OASISExpr = struct
| EOr of t * t
| EFlag of flag
| ETest of test * string
-
- type 'a choices = (t * 'a) list
+
+ type 'a choices = (t * 'a) list
let eval var_get t =
@@ -131,7 +131,7 @@ end
# 132 "myocamlbuild.ml"
module BaseEnvLight = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/base/BaseEnvLight.ml" *)
+(* # 22 "src/base/BaseEnvLight.ml" *)
module MapString = Map.Make(String)
@@ -236,7 +236,7 @@ end
# 237 "myocamlbuild.ml"
module MyOCamlbuildFindlib = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
+(* # 22 "src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
(** OCamlbuild extension, copied from
@@ -249,6 +249,9 @@ module MyOCamlbuildFindlib = struct
*)
open Ocamlbuild_plugin
+ type conf =
+ { no_automatic_syntax: bool;
+ }
(* these functions are not really officially exported *)
let run_and_read =
@@ -315,7 +318,7 @@ module MyOCamlbuildFindlib = struct
(* This lists all supported packages. *)
let find_packages () =
- List.map before_space (split_nl & run_and_read "ocamlfind list")
+ List.map before_space (split_nl & run_and_read (exec_from_conf "ocamlfind" ^ " list"))
(* Mock to list available syntaxes. *)
@@ -338,7 +341,7 @@ module MyOCamlbuildFindlib = struct
]
- let dispatch =
+ let dispatch conf =
function
| After_options ->
(* By using Before_options one let command line options have an higher
@@ -357,31 +360,39 @@ module MyOCamlbuildFindlib = struct
* -linkpkg *)
flag ["ocaml"; "link"; "program"] & 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
- (* TODO: consider how to really choose camlp4o or camlp4r. *)
- 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" ||
- List.mem pkg well_known_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 ());
+ if not (conf.no_automatic_syntax) then begin
+ (* 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
+ (* TODO: consider how to really choose camlp4o or camlp4r. *)
+ let syn_args = [A"-syntax"; A "camlp4o"] in
+ let (args, pargs) =
+ (* Heuristic to identify syntax extensions: whether they end in
+ ".syntax"; some might not.
+ *)
+ if Filename.check_suffix pkg "syntax" ||
+ List.mem pkg well_known_syntax then
+ (syn_args @ base_args, syn_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;
+
+ (* TODO: Check if this is allowed for OCaml < 3.12.1 *)
+ flag ["ocaml"; "compile"; "package("^pkg^")"] & S pargs;
+ flag ["ocaml"; "ocamldep"; "package("^pkg^")"] & S pargs;
+ flag ["ocaml"; "doc"; "package("^pkg^")"] & S pargs;
+ flag ["ocaml"; "infer_interface"; "package("^pkg^")"] & S pargs;
+ end
+ (find_packages ());
+ end;
(* Like -package but for extensions syntax. Morover -syntax is useless
* when linking. *)
@@ -415,7 +426,7 @@ module MyOCamlbuildFindlib = struct
end
module MyOCamlbuildBase = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
+(* # 22 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
(** Base functions for writing myocamlbuild.ml
@@ -430,13 +441,13 @@ module MyOCamlbuildBase = struct
module OC = Ocamlbuild_pack.Ocaml_compiler
- type dir = string
- type file = string
- type name = string
- type tag = string
+ type dir = string
+ type file = string
+ type name = string
+ type tag = string
-(* # 62 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
+(* # 62 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
type t =
@@ -448,7 +459,7 @@ module MyOCamlbuildBase = struct
* directory.
*)
includes: (dir * dir list) list;
- }
+ }
let env_filename =
@@ -546,12 +557,13 @@ module MyOCamlbuildBase = struct
(* When ocaml link something that use the C library, then one
need that file to be up to date.
+ This holds both for programs and for libraries.
*)
- dep ["link"; "ocaml"; "program"; tag_libstubs lib]
- [dir/"lib"^(nm_libstubs lib)^"."^(!Options.ext_lib)];
+ dep ["link"; "ocaml"; tag_libstubs lib]
+ [dir/"lib"^(nm_libstubs lib)^"."^(!Options.ext_lib)];
- dep ["compile"; "ocaml"; "program"; tag_libstubs lib]
- [dir/"lib"^(nm_libstubs lib)^"."^(!Options.ext_lib)];
+ dep ["compile"; "ocaml"; tag_libstubs lib]
+ [dir/"lib"^(nm_libstubs lib)^"."^(!Options.ext_lib)];
(* TODO: be more specific about what depends on headers *)
(* Depends on .h files *)
@@ -580,18 +592,18 @@ module MyOCamlbuildBase = struct
()
- let dispatch_default t =
+ let dispatch_default conf t =
dispatch_combine
[
dispatch t;
- MyOCamlbuildFindlib.dispatch;
+ MyOCamlbuildFindlib.dispatch conf;
]
end
-# 594 "myocamlbuild.ml"
+# 606 "myocamlbuild.ml"
open Ocamlbuild_plugin;;
let package_default =
{
@@ -615,9 +627,11 @@ let package_default =
}
;;
-let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
+let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false}
+
+let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;;
-# 621 "myocamlbuild.ml"
+# 635 "myocamlbuild.ml"
(* OASIS_STOP *)
(*flag ["ocaml"; "compile"; "ppopt_lwt_debug"] & S[A"-ppopt"; A"-lwt-debug"];*)
flag ["ocaml"; "compile"; "warn_error"] & S[A"-warn-error"; A"A"];
414 setup.ml
View
@@ -1,14 +1,14 @@
(* setup.ml generated for the first time by OASIS v0.2.0 *)
(* OASIS_START *)
-(* DO NOT EDIT (digest: d5076112f73ea08cbc846ba1b1aaf63b) *)
+(* DO NOT EDIT (digest: 9dbfd2192a0732e46b37917429de69c2) *)
(*
- Regenerated by OASIS v0.4.4
+ Regenerated by OASIS v0.4.5
Visit http://oasis.forge.ocamlcore.org for more information and
documentation about functions used in this file.
*)
module OASISGettext = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISGettext.ml" *)
+(* # 22 "src/oasis/OASISGettext.ml" *)
let ns_ str =
@@ -37,7 +37,7 @@ module OASISGettext = struct
end
module OASISContext = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISContext.ml" *)
+(* # 22 "src/oasis/OASISContext.ml" *)
open OASISGettext
@@ -117,7 +117,7 @@ module OASISContext = struct
end
module OASISString = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISString.ml" *)
+(* # 22 "src/oasis/OASISString.ml" *)
(** Various string utilities.
@@ -242,17 +242,15 @@ module OASISString = struct
let replace_chars f s =
- let buf = String.make (String.length s) 'X' in
- for i = 0 to String.length s - 1 do
- buf.[i] <- f s.[i]
- done;
- buf
+ let buf = Buffer.create (String.length s) in
+ String.iter (fun c -> Buffer.add_char buf (f c)) s;
+ Buffer.contents buf
end
module OASISUtils = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISUtils.ml" *)
+(* # 22 "src/oasis/OASISUtils.ml" *)
open OASISGettext
@@ -398,7 +396,7 @@ module OASISUtils = struct
end
module PropList = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/PropList.ml" *)
+(* # 22 "src/oasis/PropList.ml" *)
open OASISGettext
@@ -444,7 +442,7 @@ module PropList = struct
Hashtbl.clear t
-(* # 78 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/PropList.ml" *)
+(* # 78 "src/oasis/PropList.ml" *)
end
@@ -683,7 +681,7 @@ module PropList = struct
end
module OASISMessage = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISMessage.ml" *)
+(* # 22 "src/oasis/OASISMessage.ml" *)
open OASISGettext
@@ -727,7 +725,7 @@ module OASISMessage = struct
end
module OASISVersion = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISVersion.ml" *)
+(* # 22 "src/oasis/OASISVersion.ml" *)
open OASISGettext
@@ -739,7 +737,7 @@ module OASISVersion = struct
type s = string
- type t = string
+ type t = string
type comparator =
@@ -750,7 +748,7 @@ module OASISVersion = struct
| VLesserEqual of t
| VOr of comparator * comparator
| VAnd of comparator * comparator
-
+
(* Range of allowed characters *)
@@ -934,7 +932,7 @@ module OASISVersion = struct
end
module OASISLicense = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISLicense.ml" *)
+(* # 22 "src/oasis/OASISLicense.ml" *)
(** License for _oasis fields
@@ -945,17 +943,17 @@ module OASISLicense = struct
- type license = string
+ type license = string
- type license_exception = string
+ type license_exception = string
type license_version =
| Version of OASISVersion.t
| VersionOrLater of OASISVersion.t
| NoVersion
-
+
type license_dep_5_unit =
@@ -964,25 +962,25 @@ module OASISLicense = struct
excption: license_exception option;
version: license_version;
}
-
+
type license_dep_5 =
| DEP5Unit of license_dep_5_unit
| DEP5Or of license_dep_5 list
| DEP5And of license_dep_5 list
-
+
type t =
| DEP5License of license_dep_5
| OtherLicense of string (* URL *)
-
+
end
module OASISExpr = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISExpr.ml" *)
+(* # 22 "src/oasis/OASISExpr.ml" *)
@@ -991,10 +989,10 @@ module OASISExpr = struct
open OASISGettext
- type test = string
+ type test = string
- type flag = string
+ type flag = string
type t =
@@ -1004,10 +1002,10 @@ module OASISExpr = struct
| EOr of t * t
| EFlag of flag
| ETest of test * string
-
- type 'a choices = (t * 'a) list
+
+ type 'a choices = (t * 'a) list
let eval var_get t =
@@ -1081,7 +1079,7 @@ module OASISExpr = struct
end
module OASISText = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISText.ml" *)
+(* # 22 "src/oasis/OASISText.ml" *)
@@ -1089,53 +1087,53 @@ module OASISText = struct
| Para of string
| Verbatim of string
| BlankLine
-
- type t = elt list
+
+ type t = elt list
end
module OASISTypes = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISTypes.ml" *)
+(* # 22 "src/oasis/OASISTypes.ml" *)
- type name = string
- type package_name = string
- type url = string
- type unix_dirname = string
- type unix_filename = string
- type host_dirname = string
- type host_filename = string
- type prog = string
- type arg = string
- type args = string list
- type command_line = (prog * arg list)
+ type name = string
+ type package_name = string
+ type url = string
+ type unix_dirname = string
+ type unix_filename = string
+ type host_dirname = string
+ type host_filename = string
+ type prog = string
+ type arg = string
+ type args = string list
+ type command_line = (prog * arg list)
- type findlib_name = string
- type findlib_full = string
+ type findlib_name = string
+ type findlib_full = string
type compiled_object =
| Byte
| Native
| Best
-
+
type dependency =
| FindlibPackage of findlib_full * OASISVersion.comparator option
| InternalLibrary of name
-
+
type tool =
| ExternalTool of name
| InternalExecutable of name
-
+
type vcs =
@@ -1148,7 +1146,7 @@ module OASISTypes = struct
| Arch
| Monotone
| OtherVCS of url
-
+
type plugin_kind =
@@ -1176,7 +1174,7 @@ module OASISTypes = struct
]
- type 'a plugin = 'a * name * OASISVersion.t option
+ type 'a plugin = 'a * name * OASISVersion.t option
type all_plugin = plugin_kind plugin
@@ -1185,10 +1183,10 @@ module OASISTypes = struct
type plugin_data = (all_plugin * plugin_data_purpose * (unit -> unit)) list
-(* # 115 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISTypes.ml" *)
+(* # 115 "src/oasis/OASISTypes.ml" *)
- type 'a conditional = 'a OASISExpr.choices
+ type 'a conditional = 'a OASISExpr.choices
type custom =
@@ -1196,7 +1194,7 @@ module OASISTypes = struct
pre_command: (command_line option) conditional;
post_command: (command_line option) conditional;
}
-
+
type common_section =
@@ -1205,7 +1203,7 @@ module OASISTypes = struct
cs_data: PropList.Data.t;
cs_plugin_data: plugin_data;
}
-
+
type build_section =
@@ -1225,7 +1223,7 @@ module OASISTypes = struct
bs_byteopt: args conditional;
bs_nativeopt: args conditional;
}
-
+
type library =
@@ -1236,28 +1234,28 @@ module OASISTypes = struct
lib_findlib_parent: findlib_name option;
lib_findlib_name: findlib_name option;
lib_findlib_containers: findlib_name list;
- }
+ }
type object_ =
{
obj_modules: string list;
obj_findlib_fullname: findlib_name list option;
- }
+ }
type executable =
{
exec_custom: bool;
exec_main_is: unix_filename;
- }
+ }
type flag =
{
flag_description: string option;
flag_default: bool conditional;
- }
+ }
type source_repository =
@@ -1269,7 +1267,7 @@ module OASISTypes = struct
src_repo_branch: string option;
src_repo_tag: string option;
src_repo_subdir: unix_filename option;
- }
+ }
type test =
@@ -1280,7 +1278,7 @@ module OASISTypes = struct
test_working_directory: unix_filename option;
test_run: bool conditional;
test_tools: tool list;
- }
+ }
type doc_format =
@@ -1291,7 +1289,7 @@ module OASISTypes = struct
| Info of unix_filename
| DVI
| OtherDoc
-
+
type doc =
@@ -1307,7 +1305,7 @@ module OASISTypes = struct
doc_format: doc_format;
doc_data_files: (unix_filename * unix_filename option) list;
doc_build_tools: tool list;
- }
+ }
type section =
@@ -1318,7 +1316,7 @@ module OASISTypes = struct
| SrcRepo of common_section * source_repository
| Test of common_section * test
| Doc of common_section * doc
-
+
type section_kind =
@@ -1363,13 +1361,13 @@ module OASISTypes = struct
disable_oasis_section: unix_filename list;
schema_data: PropList.Data.t;
plugin_data: plugin_data;
- }
+ }
end
module OASISFeatures = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISFeatures.ml" *)
+(* # 22 "src/oasis/OASISFeatures.ml" *)
open OASISTypes
open OASISUtils
@@ -1729,10 +1727,17 @@ module OASISFeatures = struct
(fun () ->
s_ "Allows the OASIS section comments and digest to be omitted in \
generated files.")
+
+ let no_automatic_syntax =
+ create "no_automatic_syntax" alpha
+ (fun () ->
+ s_ "Disable the automatic inclusion of -syntax camlp4o for packages \
+ that matches the internal heuristic (if a dependency ends with \
+ a .syntax or is a well known syntax).")
end
module OASISUnixPath = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISUnixPath.ml" *)
+(* # 22 "src/oasis/OASISUnixPath.ml" *)
type unix_filename = string
@@ -1829,7 +1834,7 @@ module OASISUnixPath = struct
end
module OASISHostPath = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISHostPath.ml" *)
+(* # 22 "src/oasis/OASISHostPath.ml" *)
open Filename
@@ -1865,7 +1870,7 @@ module OASISHostPath = struct
end
module OASISSection = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISSection.ml" *)
+(* # 22 "src/oasis/OASISSection.ml" *)
open OASISTypes
@@ -1958,13 +1963,13 @@ module OASISSection = struct
end
module OASISBuildSection = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISBuildSection.ml" *)
+(* # 22 "src/oasis/OASISBuildSection.ml" *)
end
module OASISExecutable = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISExecutable.ml" *)
+(* # 22 "src/oasis/OASISExecutable.ml" *)
open OASISTypes
@@ -1998,7 +2003,7 @@ module OASISExecutable = struct
end
module OASISLibrary = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISLibrary.ml" *)
+(* # 22 "src/oasis/OASISLibrary.ml" *)
open OASISTypes
@@ -2099,16 +2104,6 @@ module OASISLibrary = struct
lst
in
- (* The headers that should be compiled along *)
- let headers =
- if lib.lib_pack then
- []
- else
- find_modules
- lib.lib_modules
- "cmi"
- in
-
(* The .cmx that be compiled along *)
let cmxs =
let should_be_built =
@@ -2134,12 +2129,32 @@ module OASISLibrary = struct
[]
in
+ (* The headers and annot/cmt files that should be compiled along *)
+ let headers =
+ let sufx =
+ if lib.lib_pack
+ then [".cmti"; ".cmt"; ".annot"]
+ else [".cmi"; ".cmti"; ".cmt"; ".annot"]
+ in
+ List.map
+ begin
+ List.fold_left
+ begin fun accu s ->
+ let dot = String.rindex s '.' in
+ let base = String.sub s 0 dot in
+ List.map ((^) base) sufx @ accu
+ end
+ []
+ end
+ (find_modules lib.lib_modules "cmi")
+ in
+
(* Compute what libraries should be built *)
let acc_nopath =
(* Add the packed header file if required *)
let add_pack_header acc =
if lib.lib_pack then
- [cs.cs_name^".cmi"] :: acc
+ [cs.cs_name^".cmi"; cs.cs_name^".cmti"; cs.cs_name^".cmt"] :: acc
else
acc
in
@@ -2190,7 +2205,7 @@ module OASISLibrary = struct
end
module OASISObject = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISObject.ml" *)
+(* # 22 "src/oasis/OASISObject.ml" *)
open OASISTypes
@@ -2258,7 +2273,7 @@ module OASISObject = struct
end
module OASISFindlib = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISFindlib.ml" *)
+(* # 22 "src/oasis/OASISFindlib.ml" *)
open OASISTypes
@@ -2499,13 +2514,13 @@ module OASISFindlib = struct
in
let library_name_of_findlib_name =
- Lazy.lazy_from_fun
- (fun () ->
- (* Revert findlib_name_of_library_name. *)
- MapString.fold
- (fun k v mp -> MapString.add v k mp)
- fndlb_name_of_lib_name
- MapString.empty)
+ lazy begin
+ (* Revert findlib_name_of_library_name. *)
+ MapString.fold
+ (fun k v mp -> MapString.add v k mp)
+ fndlb_name_of_lib_name
+ MapString.empty
+ end
in
let library_name_of_findlib_name fndlb_nm =
try
@@ -2553,37 +2568,37 @@ module OASISFindlib = struct
end
module OASISFlag = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISFlag.ml" *)
+(* # 22 "src/oasis/OASISFlag.ml" *)
end
module OASISPackage = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISPackage.ml" *)
+(* # 22 "src/oasis/OASISPackage.ml" *)
end
module OASISSourceRepository = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISSourceRepository.ml" *)
+(* # 22 "src/oasis/OASISSourceRepository.ml" *)
end
module OASISTest = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISTest.ml" *)
+(* # 22 "src/oasis/OASISTest.ml" *)
end
module OASISDocument = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISDocument.ml" *)
+(* # 22 "src/oasis/OASISDocument.ml" *)
end
module OASISExec = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISExec.ml" *)
+(* # 22 "src/oasis/OASISExec.ml" *)
open OASISGettext
@@ -2665,7 +2680,7 @@ module OASISExec = struct
end
module OASISFileUtil = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/oasis/OASISFileUtil.ml" *)
+(* # 22 "src/oasis/OASISFileUtil.ml" *)
open OASISGettext
@@ -2875,9 +2890,9 @@ module OASISFileUtil = struct
end
-# 2878 "setup.ml"
+# 2893 "setup.ml"
module BaseEnvLight = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/base/BaseEnvLight.ml" *)
+(* # 22 "src/base/BaseEnvLight.ml" *)
module MapString = Map.Make(String)
@@ -2980,9 +2995,9 @@ module BaseEnvLight = struct
end
-# 2983 "setup.ml"
+# 2998 "setup.ml"
module BaseContext = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/base/BaseContext.ml" *)
+(* # 22 "src/base/BaseContext.ml" *)
(* TODO: get rid of this module. *)
open OASISContext
@@ -2996,7 +3011,7 @@ module BaseContext = struct
end
module BaseMessage = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/base/BaseMessage.ml" *)
+(* # 22 "src/base/BaseMessage.ml" *)
(** Message to user, overrid for Base
@@ -3020,7 +3035,7 @@ module BaseMessage = struct
end
module BaseEnv = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/base/BaseEnv.ml" *)
+(* # 22 "src/base/BaseEnv.ml" *)
open OASISGettext
open OASISUtils
@@ -3502,7 +3517,7 @@ module BaseEnv = struct
end
module BaseArgExt = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/base/BaseArgExt.ml" *)
+(* # 22 "src/base/BaseArgExt.ml" *)
open OASISUtils
@@ -3532,7 +3547,7 @@ module BaseArgExt = struct
end
module BaseCheck = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/base/BaseCheck.ml" *)
+(* # 22 "src/base/BaseCheck.ml" *)
open BaseEnv
@@ -3666,7 +3681,7 @@ module BaseCheck = struct
end
module BaseOCamlcConfig = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/base/BaseOCamlcConfig.ml" *)
+(* # 22 "src/base/BaseOCamlcConfig.ml" *)
open BaseEnv
@@ -3786,7 +3801,7 @@ module BaseOCamlcConfig = struct
end
module BaseStandardVar = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/base/BaseStandardVar.ml" *)
+(* # 22 "src/base/BaseStandardVar.ml" *)
open OASISGettext
@@ -4196,7 +4211,7 @@ module BaseStandardVar = struct
end
module BaseFileAB = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/base/BaseFileAB.ml" *)
+(* # 22 "src/base/BaseFileAB.ml" *)
open BaseEnv
@@ -4247,7 +4262,7 @@ module BaseFileAB = struct
end
module BaseLog = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/base/BaseLog.ml" *)
+(* # 22 "src/base/BaseLog.ml" *)
open OASISUtils
@@ -4374,7 +4389,7 @@ module BaseLog = struct
end
module BaseBuilt = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/base/BaseBuilt.ml" *)
+(* # 22 "src/base/BaseBuilt.ml" *)
open OASISTypes
@@ -4552,7 +4567,7 @@ module BaseBuilt = struct
end
module BaseCustom = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/base/BaseCustom.ml" *)
+(* # 22 "src/base/BaseCustom.ml" *)
open BaseEnv
@@ -4605,7 +4620,7 @@ module BaseCustom = struct
end
module BaseDynVar = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/base/BaseDynVar.ml" *)
+(* # 22 "src/base/BaseDynVar.ml" *)
open OASISTypes
@@ -4653,7 +4668,7 @@ module BaseDynVar = struct
end
module BaseTest = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/base/BaseTest.ml" *)
+(* # 22 "src/base/BaseTest.ml" *)
open BaseEnv
@@ -4745,7 +4760,7 @@ module BaseTest = struct
end
module BaseDoc = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/base/BaseDoc.ml" *)
+(* # 22 "src/base/BaseDoc.ml" *)
open BaseEnv
@@ -4782,7 +4797,7 @@ module BaseDoc = struct
end
module BaseSetup = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/base/BaseSetup.ml" *)
+(* # 22 "src/base/BaseSetup.ml" *)
open BaseEnv
open BaseMessage
@@ -5391,9 +5406,9 @@ module BaseSetup = struct
end
-# 5394 "setup.ml"
+# 5409 "setup.ml"
module InternalConfigurePlugin = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/plugins/internal/InternalConfigurePlugin.ml" *)
+(* # 22 "src/plugins/internal/InternalConfigurePlugin.ml" *)
(** Configure using internal scheme
@@ -5642,7 +5657,7 @@ module InternalConfigurePlugin = struct
end
module InternalInstallPlugin = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/plugins/internal/InternalInstallPlugin.ml" *)
+(* # 22 "src/plugins/internal/InternalInstallPlugin.ml" *)
(** Install using internal scheme
@@ -5827,6 +5842,17 @@ module InternalInstallPlugin = struct
lst
in
+ let make_fnames modul sufx =
+ List.fold_right
+ begin fun sufx accu ->
+ (String.capitalize modul ^ sufx) ::
+ (String.uncapitalize modul ^ sufx) ::
+ accu
+ end
+ sufx
+ []
+ in
+
(** Install all libraries *)
let install_libs pkg =
@@ -5847,27 +5873,29 @@ module InternalInstallPlugin = struct
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 library %s")
- modul cs.cs_name;
- acc
- end)
+ begin fun acc modul ->
+ begin
+ try
+ [List.find
+ OASISFileUtil.file_exists_case
+ (List.map
+ (Filename.concat path)
+ (make_fnames modul [".mli"; ".ml"]))]
+ with Not_found ->
+ warning
+ (f_ "Cannot find source header for module %s \
+ in library %s")
+ modul cs.cs_name;
+ []
+ end
+ @
+ List.filter
+ OASISFileUtil.file_exists_case
+ (List.map
+ (Filename.concat path)
+ (make_fnames modul [".annot";".cmti";".cmt"]))
+ @ acc
+ end
acc
lib.lib_modules
in
@@ -5915,27 +5943,29 @@ module InternalInstallPlugin = struct
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)
+ begin fun acc modul ->
+ begin
+ try
+ [List.find
+ OASISFileUtil.file_exists_case
+ (List.map
+ (Filename.concat path)
+ (make_fnames modul [".mli"; ".ml"]))]
+ with Not_found ->
+ warning
+ (f_ "Cannot find source header for module %s \
+ in object %s")
+ modul cs.cs_name;
+ []
+ end
+ @
+ List.filter
+ OASISFileUtil.file_exists_case
+ (List.map
+ (Filename.concat path)
+ (make_fnames modul [".annot";".cmti";".cmt"]))
+ @ acc
+ end
acc
obj.obj_modules
in
@@ -6240,9 +6270,9 @@ module InternalInstallPlugin = struct
end
-# 6243 "setup.ml"
+# 6273 "setup.ml"
module OCamlbuildCommon = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/plugins/ocamlbuild/OCamlbuildCommon.ml" *)
+(* # 22 "src/plugins/ocamlbuild/OCamlbuildCommon.ml" *)
(** Functions common to OCamlbuild build and doc plugin
@@ -6257,7 +6287,7 @@ module OCamlbuildCommon = struct
- type extra_args = string list
+ type extra_args = string list
let ocamlbuild_clean_ev = "ocamlbuild-clean"
@@ -6298,6 +6328,11 @@ module OCamlbuildCommon = struct
else
[];
+ if bool_of_string (tests ()) then
+ ["-tag"; "tests"]
+ else
+ [];
+
if bool_of_string (profile ()) then
["-tag"; "profile"]
else
@@ -6358,7 +6393,7 @@ module OCamlbuildCommon = struct
end
module OCamlbuildPlugin = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/plugins/ocamlbuild/OCamlbuildPlugin.ml" *)
+(* # 22 "src/plugins/ocamlbuild/OCamlbuildPlugin.ml" *)
(** Build using ocamlbuild
@@ -6553,7 +6588,7 @@ module OCamlbuildPlugin = struct
end
module OCamlbuildDocPlugin = struct
-(* # 22 "/home/andre/.opam/4.02.1/build/oasis.0.4.4/src/plugins/ocamlbuild/OCamlbuildDocPlugin.ml" *)
+(* # 22 "src/plugins/ocamlbuild/OCamlbuildDocPlugin.ml" *)
(* Create documentation using ocamlbuild .odocl files
@@ -6574,7 +6609,7 @@ module OCamlbuildDocPlugin = struct
{
extra_args: string list;
run_path: unix_filename;
- }
+ }
let doc_build run pkg (cs, doc) argv =
@@ -6613,7 +6648,7 @@ module OCamlbuildDocPlugin = struct
end
-# 6616 "setup.ml"
+# 6651 "setup.ml"
open OASISTypes;;
let setup_t =
@@ -6845,11 +6880,9 @@ let setup_t =
bs_build_depends =
[
FindlibPackage
- ("lwt",
- Some (OASISVersion.VGreaterEqual "2.4.7"));
+ ("lwt", Some (OASISVersion.VEqual "2.4.6"));
FindlibPackage
- ("lwt.unix",
- Some (OASISVersion.VGreaterEqual "2.4.7"));
+ ("lwt.unix", Some (OASISVersion.VEqual "2.4.6"));
InternalLibrary "release"
];
bs_build_tools = [ExternalTool "ocamlbuild"];
@@ -7117,6 +7150,33 @@ let setup_t =
{exec_custom = false; exec_main_is = "helper.ml"});
Executable
({
+ cs_name = "lwt_test_worker";
+ cs_data = PropList.Data.create ();
+ cs_plugin_data = []
+ },
+ {
+ bs_build = [(OASISExpr.EBool true, true)];
+ bs_install = [(OASISExpr.EBool true, false)];
+ bs_path = "lib_test/lwt";
+ bs_compiled_object = Best;
+ bs_build_depends =
+ [
+ InternalLibrary "release-lwt";
+ FindlibPackage ("str", None)
+ ];
+ bs_build_tools = [ExternalTool "ocamlbuild"];
+ bs_c_sources = [];
+ bs_data_files = [];
+ bs_ccopt = [(OASISExpr.EBool true, [])];
+ bs_cclib = [(OASISExpr.EBool true, [])];
+ bs_dlllib = [(OASISExpr.EBool true, [])];
+ bs_dllpath = [(OASISExpr.EBool true, [])];
+ bs_byteopt = [(OASISExpr.EBool true, [])];
+ bs_nativeopt = [(OASISExpr.EBool true, [])]
+ },
+ {exec_custom = false; exec_main_is = "worker.ml"});
+ Executable
+ ({
cs_name = "lwt_masterctl";
cs_data = PropList.Data.create ();
cs_plugin_data = []
@@ -7178,9 +7238,9 @@ let setup_t =
plugin_data = []
};
oasis_fn = Some "_oasis";
- oasis_version = "0.4.4";
+ oasis_version = "0.4.5";
oasis_digest =
- Some "\020\232\239\223\253\130\232\230\167]\017\193q\1343\142";
+ Some "?y\146\194\242\031F\189\181\030\131<\027\136\218\251";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
@@ -7188,6 +7248,6 @@ let setup_t =
let setup () = BaseSetup.setup setup_t;;
-# 7192 "setup.ml"
+# 7252 "setup.ml"
(* OASIS_STOP *)
let () = setup ();;
Please sign in to comment.
Something went wrong with that request. Please try again.