Merge pull request #74 from djs55/release.0.9.28

Release.0.9.28

Author: djs55

CHANGES

@@ -1,14 +1,18 @@
-0.9.27 (8-Oct-2014)
+0.9.28 (20-Nov-2014):
+* xenlight: improve error message when parsing an invalid enum
+* xentoollog: make this a toplevel ocamlfind package
+
+0.9.27 (8-Oct-2014):
 * Fix build on Fedora 21 (by removing -DBSD_SOURCE)
 * Fix 'configure' on OS X
 
-0.9.26 (10-Sep-2014)
+0.9.26 (10-Sep-2014):
 * improve configure to detect libxc backports
 
-0.9.22 (23-Aug-2014)
+0.9.22 (23-Aug-2014):
 * only build xenlight on xen-4.4 and xen-4.5 (xen-4.2 is too old)
 
-0.9.21 (20-Aug-2014)
+0.9.21 (20-Aug-2014):
 * experimental support for xen 4.5 (currently in development)
 
 0.9.20 (4-Jul-2014):

_oasis

@@ -1,6 +1,6 @@
 OASISFormat: 0.3
 Name:        xen-lowlevel-libs
-Version:     0.9.27
+Version:     0.9.28
 Synopsis:    Xen low-level bindings
 Authors:     see xen-unstable.hg
 License:     LGPL-2.1 with OCaml linking exception

_tags

@@ -1,8 +1,9 @@
 # OASIS_START
-# DO NOT EDIT (digest: f6c047538f172bb38d227f6df44ea396)
+# DO NOT EDIT (digest: dcd3ef160e8ae5b99cd33fed790be7b6)
 # 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,7 +16,7 @@
 "_darcs": not_hygienic
 # Library xenctrl
 "lib/xenctrl.cmxs": use_xenctrl
-<lib/*.ml{,i}>: oasis_library_xenctrl_ccopt
+<lib/*.ml{,i,y}>: oasis_library_xenctrl_ccopt
 "lib/xenmmap_stubs.c": oasis_library_xenctrl_ccopt
 "lib/xenctrl_stubs.c": oasis_library_xenctrl_ccopt
 <lib/xenctrl.{cma,cmxa}>: oasis_library_xenctrl_cclib
@@ -24,9 +25,9 @@
 "lib/libxenctrl_stubs.a": oasis_library_xenctrl_cclib
 "lib/dllxenctrl_stubs.so": oasis_library_xenctrl_cclib
 <lib/xenctrl.{cma,cmxa}>: use_libxenctrl_stubs
-<lib/*.ml{,i}>: pkg_bigarray
-<lib/*.ml{,i}>: pkg_lwt
-<lib/*.ml{,i}>: pkg_unix
+<lib/*.ml{,i,y}>: pkg_bigarray
+<lib/*.ml{,i,y}>: pkg_lwt
+<lib/*.ml{,i,y}>: pkg_unix
 "lib/xenmmap_stubs.c": pkg_bigarray
 "lib/xenmmap_stubs.c": pkg_lwt
 "lib/xenmmap_stubs.c": pkg_unix
@@ -49,7 +50,7 @@
 "xenlight/libxenlight_stubs.a": oasis_library_xenlight_cclib
 "xenlight/dllxenlight_stubs.so": oasis_library_xenlight_cclib
 <xenlight/xenlight.{cma,cmxa}>: use_libxenlight_stubs
-<xenlight/*.ml{,i}>: use_xentoollog
+<xenlight/*.ml{,i,y}>: use_xentoollog
 "xenlight/xenlight_stubs.c": use_xentoollog
 # Library xenguest42
 "xenguest-4.2/xenguest42.cmxs": use_xenguest42
@@ -65,21 +66,21 @@
 <xenguest-4.2/xenguest_main.{native,byte}>: pkg_unix
 <xenguest-4.2/xenguest_main.{native,byte}>: use_xenctrl
 <xenguest-4.2/xenguest_main.{native,byte}>: use_xenguest42
-<xenguest-4.2/*.ml{,i}>: pkg_bigarray
-<xenguest-4.2/*.ml{,i}>: pkg_lwt
-<xenguest-4.2/*.ml{,i}>: pkg_unix
-<xenguest-4.2/*.ml{,i}>: use_xenctrl
-<xenguest-4.2/*.ml{,i}>: use_xenguest42
+<xenguest-4.2/*.ml{,i,y}>: pkg_bigarray
+<xenguest-4.2/*.ml{,i,y}>: pkg_lwt
+<xenguest-4.2/*.ml{,i,y}>: pkg_unix
+<xenguest-4.2/*.ml{,i,y}>: use_xenctrl
+<xenguest-4.2/*.ml{,i,y}>: use_xenguest42
 <xenguest-4.2/xenguest_main.{native,byte}>: custom
 # Executable test_hvm_check_pvdriver
 <test/test_hvm_check_pvdriver.{native,byte}>: pkg_bigarray
 <test/test_hvm_check_pvdriver.{native,byte}>: pkg_lwt
 <test/test_hvm_check_pvdriver.{native,byte}>: pkg_unix
 <test/test_hvm_check_pvdriver.{native,byte}>: use_xenctrl
-<test/*.ml{,i}>: pkg_bigarray
-<test/*.ml{,i}>: pkg_lwt
-<test/*.ml{,i}>: pkg_unix
-<test/*.ml{,i}>: use_xenctrl
+<test/*.ml{,i,y}>: pkg_bigarray
+<test/*.ml{,i,y}>: pkg_lwt
+<test/*.ml{,i,y}>: pkg_unix
+<test/*.ml{,i,y}>: use_xenctrl
 <test/test_hvm_check_pvdriver.{native,byte}>: custom
 # OASIS_STOP
 <configure.*>: not_hygienic

lib/META

@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: 87531aa00c7638cca3c97f1251236560)
-version = "0.9.27"
+# DO NOT EDIT (digest: 63cf6d08ce51ba1896c6512b631d38f0)
+version = "0.9.28"
 description = "Xen low-level bindings"
 requires = "unix lwt bigarray"
 archive(byte) = "xenctrl.cma"

myocamlbuild.ml

@@ -1,5 +1,5 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 6b9712fdcc5513f395197a91737c8fc6) *)
+(* DO NOT EDIT (digest: ea1ac9da767156053202faa58b513a28) *)
 module OASISGettext = struct
 (* # 22 "src/oasis/OASISGettext.ml" *)
 
@@ -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. *)
@@ -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 =
   {
@@ -695,8 +707,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;;
 
-# 701 "myocamlbuild.ml"
+# 715 "myocamlbuild.ml"
 (* OASIS_STOP *)
 Ocamlbuild_plugin.dispatch dispatch_default;;

opam

@@ -0,0 +1,26 @@
+opam-version: "1"
+maintainer: "[email protected]"
+tags: [
+  "org:mirage"
+  "org:xapi-project"
+]
+build: [
+  ["./configure"]
+  [make]
+  [make "install" "BINDIR=%{bin}%"]
+]
+remove: [
+  [make "uninstall"]
+]
+depends: [
+  "ocamlfind"
+  "lwt"
+  "cmdliner"
+]
+depexts: [
+  [["debian"] ["libxen-dev" "uuid-dev"]]
+  [["ubuntu"] ["libxen-dev" "uuid-dev"]]
+  [["centos"] ["xen-devel"]]
+  [["xenserver"] ["xen-dom0-libs-devel" "xen-libs-devel"]]
+]
+ocaml-version: [>= "4.00.0"]