Merge pull request #15 from djs55/release.0.9.7

Release.0.9.7
xapi-project · Nov 20, 2014 · 7b01cff · 7b01cff
2 parents 92f281c + a74f0d5
commit 7b01cff
Show file tree

Hide file tree

Showing 17 changed files with 299 additions and 244 deletions.
diff --git 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
@@ -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
@@ -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
-<sha1/*.ml{,i}>: pkg_forkexec
-<sha1/*.ml{,i}>: pkg_stdext
-<sha1/*.ml{,i}>: pkg_threads
+<sha1/*.ml{,i,y}>: pkg_forkexec
+<sha1/*.ml{,i,y}>: pkg_stdext
+<sha1/*.ml{,i,y}>: pkg_threads
 # Library gzip
 "gzip/gzip.cmxs": use_gzip
-<gzip/*.ml{,i}>: pkg_forkexec
-<gzip/*.ml{,i}>: pkg_stdext
-<gzip/*.ml{,i}>: pkg_threads
+<gzip/*.ml{,i,y}>: pkg_forkexec
+<gzip/*.ml{,i,y}>: pkg_stdext
+<gzip/*.ml{,i,y}>: pkg_threads
 # Library xenstore
 "xenstore/xenstore.cmxs": use_xenstore
-<xenstore/*.ml{,i}>: pkg_stdext
-<xenstore/*.ml{,i}>: pkg_threads
-<xenstore/*.ml{,i}>: pkg_xenstore.unix
-<xenstore/*.ml{,i}>: pkg_xenstore_transport.unix
+<xenstore/*.ml{,i,y}>: pkg_stdext
+<xenstore/*.ml{,i,y}>: pkg_threads
+<xenstore/*.ml{,i,y}>: pkg_xenstore.unix
+<xenstore/*.ml{,i,y}>: pkg_xenstore_transport.unix
 # Library xenctrlext
 "xenctrlext/xenctrlext.cmxs": use_xenctrlext
 <xenctrlext/xenctrlext.{cma,cmxa}>: use_libxenctrlext_stubs
-<xenctrlext/*.ml{,i}>: pkg_stdext
-<xenctrlext/*.ml{,i}>: pkg_threads
-<xenctrlext/*.ml{,i}>: pkg_xenctrl
-<xenctrlext/*.ml{,i}>: pkg_xenstore.unix
-<xenctrlext/*.ml{,i}>: pkg_xenstore_transport.unix
-<xenctrlext/*.ml{,i}>: use_xenstore
+<xenctrlext/*.ml{,i,y}>: pkg_stdext
+<xenctrlext/*.ml{,i,y}>: pkg_threads
+<xenctrlext/*.ml{,i,y}>: pkg_xenctrl
+<xenctrlext/*.ml{,i,y}>: pkg_xenstore.unix
+<xenctrlext/*.ml{,i,y}>: pkg_xenstore_transport.unix
+<xenctrlext/*.ml{,i,y}>: 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
-<xen-utils/*.ml{,i}>: pkg_forkexec
-<xen-utils/*.ml{,i}>: pkg_stdext
-<xen-utils/*.ml{,i}>: pkg_threads
+<xen-utils/*.ml{,i,y}>: pkg_forkexec
+<xen-utils/*.ml{,i,y}>: pkg_stdext
+<xen-utils/*.ml{,i,y}>: pkg_threads
 # Library cpuid
 "cpuid/cpuid.cmxs": use_cpuid
 <cpuid/cpuid.{cma,cmxa}>: use_libcpuid_stubs
-<cpuid/*.ml{,i}>: pkg_forkexec
-<cpuid/*.ml{,i}>: pkg_stdext
-<cpuid/*.ml{,i}>: pkg_threads
-<cpuid/*.ml{,i}>: pkg_xenctrl
-<cpuid/*.ml{,i}>: pkg_xenstore.unix
-<cpuid/*.ml{,i}>: pkg_xenstore_transport.unix
-<cpuid/*.ml{,i}>: use_xenctrlext
-<cpuid/*.ml{,i}>: use_xenstore
-<cpuid/*.ml{,i}>: use_xenutils
+<cpuid/*.ml{,i,y}>: pkg_forkexec
+<cpuid/*.ml{,i,y}>: pkg_stdext
+<cpuid/*.ml{,i,y}>: pkg_threads
+<cpuid/*.ml{,i,y}>: pkg_xenctrl
+<cpuid/*.ml{,i,y}>: pkg_xenstore.unix
+<cpuid/*.ml{,i,y}>: pkg_xenstore_transport.unix
+<cpuid/*.ml{,i,y}>: use_xenctrlext
+<cpuid/*.ml{,i,y}>: use_xenstore
+<cpuid/*.ml{,i,y}>: 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
-<pciutil/*.ml{,i}>: pkg_stdext
-<pciutil/*.ml{,i}>: pkg_threads
+<pciutil/*.ml{,i,y}>: pkg_stdext
+<pciutil/*.ml{,i,y}>: pkg_threads
 # Library uuid
 "uuid/uuid.cmxs": use_uuid
 # Library xmllight2
 "xml-light2/xmllight2.cmxs": use_xmllight2
-<xml-light2/*.ml{,i}>: pkg_stdext
-<xml-light2/*.ml{,i}>: pkg_threads
-<xml-light2/*.ml{,i}>: pkg_xmlm
+<xml-light2/*.ml{,i,y}>: pkg_stdext
+<xml-light2/*.ml{,i,y}>: pkg_threads
+<xml-light2/*.ml{,i,y}>: pkg_xmlm
 # Library stunnel
 "stunnel/stunnel.cmxs": use_stunnel
-<stunnel/*.ml{,i}>: pkg_forkexec
-<stunnel/*.ml{,i}>: pkg_stdext
-<stunnel/*.ml{,i}>: pkg_threads
-<stunnel/*.ml{,i}>: pkg_xcp
+<stunnel/*.ml{,i,y}>: pkg_forkexec
+<stunnel/*.ml{,i,y}>: pkg_stdext
+<stunnel/*.ml{,i,y}>: pkg_threads
+<stunnel/*.ml{,i,y}>: pkg_xcp
 # Library httpsvr
 "http-svr/httpsvr.cmxs": use_httpsvr
-<http-svr/*.ml{,i}>: pkg_forkexec
-<http-svr/*.ml{,i}>: pkg_rpclib
-<http-svr/*.ml{,i}>: pkg_rpclib.syntax
-<http-svr/*.ml{,i}>: pkg_stdext
-<http-svr/*.ml{,i}>: pkg_threads
-<http-svr/*.ml{,i}>: pkg_xcp
-<http-svr/*.ml{,i}>: pkg_xmlm
-<http-svr/*.ml{,i}>: use_stunnel
-<http-svr/*.ml{,i}>: use_xmllight2
+<http-svr/*.ml{,i,y}>: pkg_forkexec
+<http-svr/*.ml{,i,y}>: pkg_rpclib
+<http-svr/*.ml{,i,y}>: pkg_rpclib.syntax
+<http-svr/*.ml{,i,y}>: pkg_stdext
+<http-svr/*.ml{,i,y}>: pkg_threads
+<http-svr/*.ml{,i,y}>: pkg_xcp
+<http-svr/*.ml{,i,y}>: pkg_xmlm
+<http-svr/*.ml{,i,y}>: use_stunnel
+<http-svr/*.ml{,i,y}>: use_xmllight2
 # Library sexpr
 "sexpr/sexpr.cmxs": use_sexpr
-<sexpr/*.ml{,i}>: pkg_stdext
-<sexpr/*.ml{,i}>: pkg_threads
+<sexpr/*.ml{,i,y}>: pkg_stdext
+<sexpr/*.ml{,i,y}>: pkg_threads
 # OASIS_STOP
 <http-svr/*.ml{,i}>: syntax_camlp4o
diff --git 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
@@ -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
@@ -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
@@ -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;;