diff --git a/ChangeLog b/ChangeLog index ae6a3be..1cb36b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +0.9.7 (20-Nov-2014): +* Update to new Backtrace API +* Remove bindings to 'set_hpet' and 'set_vpt_align' + 0.9.6 (4-Jun-2014) * Fix CPUID functions on ARM to do The Right Thing * Update to stdext 0.11.0 diff --git a/_oasis b/_oasis index b921c82..d6cb0f6 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ OASISFormat: 0.3 Name: xen-api-libs-transitional -Version: 0.9.6 +Version: 0.9.7 Synopsis: Temporary set of to-be-deprecated libraries License: LGPL-2.1 with OCaml linking exception Authors: various diff --git a/_tags b/_tags index 2a68702..62d051a 100644 --- a/_tags +++ b/_tags @@ -1,8 +1,9 @@ # OASIS_START -# DO NOT EDIT (digest: 6404d67d298a795930eacf50ea0a2535) +# DO NOT EDIT (digest: 921ab6781026c3f29cf98fe2e4c899dc) # 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,29 +16,29 @@ "_darcs": not_hygienic # Library sha1 "sha1/sha1.cmxs": use_sha1 -: pkg_forkexec -: pkg_stdext -: pkg_threads +: pkg_forkexec +: pkg_stdext +: pkg_threads # Library gzip "gzip/gzip.cmxs": use_gzip -: pkg_forkexec -: pkg_stdext -: pkg_threads +: pkg_forkexec +: pkg_stdext +: pkg_threads # Library xenstore "xenstore/xenstore.cmxs": use_xenstore -: pkg_stdext -: pkg_threads -: pkg_xenstore.unix -: pkg_xenstore_transport.unix +: pkg_stdext +: pkg_threads +: pkg_xenstore.unix +: pkg_xenstore_transport.unix # Library xenctrlext "xenctrlext/xenctrlext.cmxs": use_xenctrlext : use_libxenctrlext_stubs -: pkg_stdext -: pkg_threads -: pkg_xenctrl -: pkg_xenstore.unix -: pkg_xenstore_transport.unix -: use_xenstore +: pkg_stdext +: pkg_threads +: pkg_xenctrl +: pkg_xenstore.unix +: pkg_xenstore_transport.unix +: use_xenstore "xenctrlext/xenctrlext_stubs.c": pkg_stdext "xenctrlext/xenctrlext_stubs.c": pkg_threads "xenctrlext/xenctrlext_stubs.c": pkg_xenctrl @@ -46,21 +47,21 @@ "xenctrlext/xenctrlext_stubs.c": use_xenstore # Library xenutils "xen-utils/xenutils.cmxs": use_xenutils -: pkg_forkexec -: pkg_stdext -: pkg_threads +: pkg_forkexec +: pkg_stdext +: pkg_threads # Library cpuid "cpuid/cpuid.cmxs": use_cpuid : use_libcpuid_stubs -: pkg_forkexec -: pkg_stdext -: pkg_threads -: pkg_xenctrl -: pkg_xenstore.unix -: pkg_xenstore_transport.unix -: use_xenctrlext -: use_xenstore -: use_xenutils +: pkg_forkexec +: pkg_stdext +: pkg_threads +: pkg_xenctrl +: pkg_xenstore.unix +: pkg_xenstore_transport.unix +: use_xenctrlext +: use_xenstore +: use_xenutils "cpuid/cpuid_stubs.c": pkg_forkexec "cpuid/cpuid_stubs.c": pkg_stdext "cpuid/cpuid_stubs.c": pkg_threads @@ -72,35 +73,35 @@ "cpuid/cpuid_stubs.c": use_xenutils # Library pciutil "pciutil/pciutil.cmxs": use_pciutil -: pkg_stdext -: pkg_threads +: pkg_stdext +: pkg_threads # Library uuid "uuid/uuid.cmxs": use_uuid # Library xmllight2 "xml-light2/xmllight2.cmxs": use_xmllight2 -: pkg_stdext -: pkg_threads -: pkg_xmlm +: pkg_stdext +: pkg_threads +: pkg_xmlm # Library stunnel "stunnel/stunnel.cmxs": use_stunnel -: pkg_forkexec -: pkg_stdext -: pkg_threads -: pkg_xcp +: pkg_forkexec +: pkg_stdext +: pkg_threads +: pkg_xcp # Library httpsvr "http-svr/httpsvr.cmxs": use_httpsvr -: pkg_forkexec -: pkg_rpclib -: pkg_rpclib.syntax -: pkg_stdext -: pkg_threads -: pkg_xcp -: pkg_xmlm -: use_stunnel -: use_xmllight2 +: pkg_forkexec +: pkg_rpclib +: pkg_rpclib.syntax +: pkg_stdext +: pkg_threads +: pkg_xcp +: pkg_xmlm +: use_stunnel +: use_xmllight2 # Library sexpr "sexpr/sexpr.cmxs": use_sexpr -: pkg_stdext -: pkg_threads +: pkg_stdext +: pkg_threads # OASIS_STOP : syntax_camlp4o diff --git a/cpuid/META b/cpuid/META index d0071e9..3c83a27 100644 --- a/cpuid/META +++ b/cpuid/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: 5d9d5f8dea6678f0bafc4c237b3e0281) -version = "0.9.6" +# DO NOT EDIT (digest: ce065de67ef89727803e0c60fc1eab86) +version = "0.9.7" description = "Temporary set of to-be-deprecated libraries" requires = "stdext threads xenctrl xenctrlext xen-utils" archive(byte) = "cpuid.cma" diff --git a/gzip/META b/gzip/META index a0f10ec..a159050 100644 --- a/gzip/META +++ b/gzip/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: c279e1f099f8513330c32eec73d68e3d) -version = "0.9.6" +# DO NOT EDIT (digest: e31c6994df53d0ea9af2005fc58f8754) +version = "0.9.7" description = "Temporary set of to-be-deprecated libraries" requires = "stdext forkexec threads" archive(byte) = "gzip.cma" diff --git a/http-svr/META b/http-svr/META index 6d7938e..5787ff0 100644 --- a/http-svr/META +++ b/http-svr/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: 27601504cbe6e316c168f3cfae26b522) -version = "0.9.6" +# DO NOT EDIT (digest: 62bab4ac87ba3f971303beb33f6ccab8) +version = "0.9.7" description = "Temporary set of to-be-deprecated libraries" requires = "stdext threads rpclib rpclib.syntax xml-light2 stunnel xcp" archive(byte) = "httpsvr.cma" diff --git a/myocamlbuild.ml b/myocamlbuild.ml index bc188f1..3cddba6 100644 --- a/myocamlbuild.ml +++ b/myocamlbuild.ml @@ -1,5 +1,5 @@ (* OASIS_START *) -(* DO NOT EDIT (digest: 890f13652ffde6137b871999d44924ee) *) +(* DO NOT EDIT (digest: 1ad9d1b921d023cd4230b9532f9505f1) *) module OASISGettext = struct (* # 22 "src/oasis/OASISGettext.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 = @@ -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. *) @@ -430,10 +441,10 @@ 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 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *) @@ -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 = { @@ -621,8 +633,10 @@ 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;; -# 627 "myocamlbuild.ml" +# 641 "myocamlbuild.ml" (* OASIS_STOP *) Ocamlbuild_plugin.dispatch dispatch_default;; diff --git a/pciutil/META b/pciutil/META index dddefbf..83302c2 100644 --- a/pciutil/META +++ b/pciutil/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: e3ce5c7a07917ca1085d080b075a92c1) -version = "0.9.6" +# DO NOT EDIT (digest: 5a9ed2c0072d6f33431cd7b03efbf149) +version = "0.9.7" description = "Temporary set of to-be-deprecated libraries" requires = "stdext threads" archive(byte) = "pciutil.cma" diff --git a/setup.ml b/setup.ml index f0920bb..659e783 100644 --- a/setup.ml +++ b/setup.ml @@ -1,9 +1,9 @@ (* setup.ml generated for the first time by OASIS v0.3.0 *) (* OASIS_START *) -(* DO NOT EDIT (digest: e778fd1fe58cb18a92ec9e23406d4d5f) *) +(* DO NOT EDIT (digest: 1dccbe7a52e58b17393fec1e7953f503) *) (* - 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. *) @@ -242,11 +242,9 @@ 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 @@ -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 *) @@ -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,19 +962,19 @@ 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 @@ -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 = @@ -1089,9 +1087,9 @@ module OASISText = struct | Para of string | Verbatim of string | BlankLine - - type t = elt list + + type t = elt list end @@ -1102,40 +1100,40 @@ module OASISTypes = struct - 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 @@ -1188,7 +1186,7 @@ module OASISTypes = struct (* # 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,7 +1361,7 @@ module OASISTypes = struct disable_oasis_section: unix_filename list; schema_data: PropList.Data.t; plugin_data: plugin_data; - } + } end @@ -1729,6 +1727,13 @@ 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 @@ -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 @@ -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 @@ -2875,7 +2890,7 @@ module OASISFileUtil = struct end -# 2878 "setup.ml" +# 2893 "setup.ml" module BaseEnvLight = struct (* # 22 "src/base/BaseEnvLight.ml" *) @@ -2980,7 +2995,7 @@ module BaseEnvLight = struct end -# 2983 "setup.ml" +# 2998 "setup.ml" module BaseContext = struct (* # 22 "src/base/BaseContext.ml" *) @@ -5391,7 +5406,7 @@ module BaseSetup = struct end -# 5394 "setup.ml" +# 5409 "setup.ml" module InternalConfigurePlugin = struct (* # 22 "src/plugins/internal/InternalConfigurePlugin.ml" *) @@ -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,7 +6270,7 @@ module InternalInstallPlugin = struct end -# 6243 "setup.ml" +# 6273 "setup.ml" module OCamlbuildCommon = struct (* # 22 "src/plugins/ocamlbuild/OCamlbuildCommon.ml" *) @@ -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 @@ -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 = @@ -6638,7 +6673,7 @@ let setup_t = alpha_features = []; beta_features = []; name = "xen-api-libs-transitional"; - version = "0.9.6"; + version = "0.9.7"; license = OASISLicense.DEP5License (OASISLicense.DEP5Unit @@ -7139,8 +7174,9 @@ let setup_t = plugin_data = [] }; oasis_fn = Some "_oasis"; - oasis_version = "0.4.4"; - oasis_digest = Some "\020UE\003\206\026\019\235\223\022\201G$\243ao"; + oasis_version = "0.4.5"; + oasis_digest = + Some "<\255\167\200\160\170\167\253\234[)\137\227\1803\137"; oasis_exec = None; oasis_setup_args = []; setup_update = false @@ -7148,6 +7184,6 @@ let setup_t = let setup () = BaseSetup.setup setup_t;; -# 7152 "setup.ml" +# 7188 "setup.ml" (* OASIS_STOP *) let () = setup ();; diff --git a/sexpr/META b/sexpr/META index c69f67b..4097884 100644 --- a/sexpr/META +++ b/sexpr/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: 62900c795d623da99a5e707cccd15daf) -version = "0.9.6" +# DO NOT EDIT (digest: 29c69e6f71d23c02c5784dd57de3b6aa) +version = "0.9.7" description = "Temporary set of to-be-deprecated libraries" requires = "stdext threads" archive(byte) = "sexpr.cma" diff --git a/sha1/META b/sha1/META index 228d742..ba4ab03 100644 --- a/sha1/META +++ b/sha1/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: 894a657c904b010fbc5b143f2cb80014) -version = "0.9.6" +# DO NOT EDIT (digest: a3e9fd1c15781108031e7a6d6b499fd1) +version = "0.9.7" description = "Temporary set of to-be-deprecated libraries" requires = "stdext forkexec threads" archive(byte) = "sha1.cma" diff --git a/stunnel/META b/stunnel/META index 05ec161..fae6a40 100644 --- a/stunnel/META +++ b/stunnel/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: ca7fc5e230f782aa23113c6361bbe41a) -version = "0.9.6" +# DO NOT EDIT (digest: 409599c7f7b93f00d9758b75995cde6f) +version = "0.9.7" description = "Temporary set of to-be-deprecated libraries" requires = "forkexec threads stdext xcp" archive(byte) = "stunnel.cma" diff --git a/uuid/META b/uuid/META index 8c615a2..c7df1b9 100644 --- a/uuid/META +++ b/uuid/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: 420b860864977df3a6dd5416dc36b3c2) -version = "0.9.6" +# DO NOT EDIT (digest: a0b439fabf7815e148f42c4da8a04777) +version = "0.9.7" description = "Temporary set of to-be-deprecated libraries" archive(byte) = "uuid.cma" archive(byte, plugin) = "uuid.cma" diff --git a/xen-utils/META b/xen-utils/META index d0073dc..28d6dba 100644 --- a/xen-utils/META +++ b/xen-utils/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: b8d93ef387cf106389869d71c289a10b) -version = "0.9.6" +# DO NOT EDIT (digest: 1bc8413870a729041079eeec133b3e90) +version = "0.9.7" description = "Temporary set of to-be-deprecated libraries" requires = "stdext threads forkexec" archive(byte) = "xenutils.cma" diff --git a/xenctrlext/META b/xenctrlext/META index 682f9bf..c73e21e 100644 --- a/xenctrlext/META +++ b/xenctrlext/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: 2ec89eb05cb0228e4a5316ca358b4d0a) -version = "0.9.6" +# DO NOT EDIT (digest: 764b4db9980fa4d57503248acaa3a2ec) +version = "0.9.7" description = "Temporary set of to-be-deprecated libraries" requires = "xenctrl xenstore-compat" archive(byte) = "xenctrlext.cma" diff --git a/xenstore/META b/xenstore/META index 8d25a8a..9c0d559 100644 --- a/xenstore/META +++ b/xenstore/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: 2c032f007c04f3d6a78b6bcd167ad2fd) -version = "0.9.6" +# DO NOT EDIT (digest: 06ef8a8ca72b236242745d52b7039eda) +version = "0.9.7" description = "Temporary set of to-be-deprecated libraries" requires = "xenstore.unix xenstore_transport.unix threads stdext" archive(byte) = "xenstore.cma" diff --git a/xml-light2/META b/xml-light2/META index 669aea8..f1438d0 100644 --- a/xml-light2/META +++ b/xml-light2/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: 560b47144f2976bf00f3c714df47a75b) -version = "0.9.6" +# DO NOT EDIT (digest: 37154a716c79b2640b9fb2ea8b2825a1) +version = "0.9.7" description = "Temporary set of to-be-deprecated libraries" requires = "xmlm stdext threads" archive(byte) = "xmllight2.cma"