mirage · Mar 20, 2016 · Mar 20, 2016 · Mar 20, 2016 · Mar 20, 2016 · Mar 20, 2016
Showing with 35 additions and 12 deletions.

+10 −1 CHANGES.md

+1 −1 _oasis

+3 −3 lib/META

+8 −4 lib/mirage.ml

+6 −0 lib/mirage_key.ml

+4 −0 lib/mirage_key.mli

+3 −3 setup.ml
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,14 @@
+### 2.7.3 (2016-03-20)
+
+* Fix another regression introduced in 2.7.1 which enable
+  `-warn-error` by default. This is now controlled by a
+  `--warn-error` flag on `mirage configure`. Currently it's
+  default value is [false] but this might change in future
+  versions (#520)
+
 ### 2.7.2 (2016-03-20)
 
-* Fix regression introduce in 2.7.1 which truncates the ouput of
+* Fix regression introduced in 2.7.1 which truncates the ouput of
   `opam install` and breaks `opam depext` (#519, by @samoht)
 
 ### 2.7.1 (2016-03-17)
@@ -12,6 +20,7 @@
     should make the default unikernels camlp4-free (#510, #515 by @samoht)
   - always require `mirage-platform` (#512, by @talex5)
   - ensure that `mirage-types` and `mirage-types-lwt` are installed
+* Turn on more warnings and enable "warning as errors".
 * Check that the OCaml compiler is at least 4.02.3 (by @samoht)
 
 ### 2.7.0 (2016-02-17)

diff --git a/_oasis b/_oasis
@@ -1,6 +1,6 @@
 OASISFormat: 0.4
 Name:        mirage
-Version:     2.7.2
+Version:     2.7.3
 Synopsis:    Mirage configuration tool
 Authors:     Thomas Gazagnaire, Anil Madhavapeddy, Dave Scott, Thomas Leonard
 License:     ISC

diff --git a/lib/META b/lib/META
@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: 2af7ef075b19e30042a16861d5ffc989)
-version = "2.7.2"
+# DO NOT EDIT (digest: e7cfdb595e00348f8bf3b691c9c125c0)
+version = "2.7.3"
 description = "Mirage configuration tool"
 requires = "ipaddr functoria mirage.runtime functoria.app"
 archive(byte) = "mirage.cma"
@@ -9,7 +9,7 @@ archive(native) = "mirage.cmxa"
 archive(native, plugin) = "mirage.cmxs"
 exists_if = "mirage.cma"
 package "runtime" (
- version = "2.7.2"
+ version = "2.7.3"
  description = "Mirage configuration tool"
  requires = "functoria.runtime ipaddr astring"
  archive(byte) = "mirage-runtime.cma"

diff --git a/lib/mirage.ml b/lib/mirage.ml
@@ -1276,7 +1276,7 @@ let configure_myocamlbuild_ml ~root =
 
 let clean_myocamlbuild_ml ~root = Cmd.remove (root / "myocamlbuild.ml")
 
-let configure_makefile ~target ~root ~name info =
+let configure_makefile ~target ~root ~name ~warn_error info =
   let open Codegen in
   let file = root / "Makefile" in
   let libs = Info.libraries info in
@@ -1294,6 +1294,7 @@ let configure_makefile ~target ~root ~name info =
   append fmt "LIBS   = %s" libraries;
   append fmt "PKGS   = %s" packages;
   let default_tags =
+    (if warn_error then "warn_error(+1..49)," else "") ^
     "warn(A-4-41-44),debug,bin_annot,\
      strict_sequence,principal,safe_string"
   in
@@ -1408,8 +1409,10 @@ let check_ocaml_version () =
 let configure i =
   let name = Info.name i in
   let root = Info.root i in
-  let target = Key.(get (Info.context i) target) in
-  let ocaml_check = not (Key.(get (Info.context i) no_ocaml_check)) in
+  let ctx = Info.context i in
+  let target = Key.(get ctx target) in
+  let ocaml_check = not Key.(get ctx no_ocaml_check) in
+  let warn_error = Key.(get ctx warn_error) in
   begin
     if ocaml_check then check_ocaml_version ()
     else R.ok ()
@@ -1422,7 +1425,7 @@ let configure i =
       configure_main_xe ~root ~name;
       configure_main_libvirt_xml ~root ~name;
       configure_myocamlbuild_ml ~root;
-      configure_makefile ~target ~root ~name i;
+      configure_makefile ~target ~root ~name ~warn_error i;
     )
 
 let clean i =
@@ -1457,6 +1460,7 @@ module Project = struct
         Key.(abstract unix);
         Key.(abstract xen);
         Key.(abstract no_ocaml_check);
+        Key.(abstract warn_error);
       ]
 
       method packages =

diff --git a/lib/mirage_key.ml b/lib/mirage_key.ml
@@ -148,6 +148,12 @@ let no_ocaml_check =
   let key = Arg.flag ~stage:`Configure doc in
   Key.create "ocaml_version_check" key
 
+let warn_error =
+  let doc = "Enable -warn-error when compiling OCaml sources." in
+  let doc = Arg.info ~docs:mirage_section ~docv:"BOOL" ~doc ["warn-error"] in
+  let key = Arg.(opt ~stage:`Configure bool false doc) in
+  Key.create "warn_error" key
+
 (** {3 Tracing} *)
 
 let tracing_size default =

diff --git a/lib/mirage_key.mli b/lib/mirage_key.mli
@@ -47,6 +47,10 @@ val xen: bool key
 val no_ocaml_check: bool key
 (** [--no-ocaml-check]. Do not check the version of the compiler. *)
 
+val warn_error: bool key
+(** [--warn-error]. Enable {i -warn-error} for OCaml sources. Set to [false] by
+    default, but might might enabled by default in later releases. *)
+
 val tracing_size: int -> int key
 (** [--tracing-size]: Key setting the tracing ring buffer size. *)
 

diff --git a/setup.ml b/setup.ml
@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.5 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: e123bd014ceccadea3347200d67f3b92) *)
+(* DO NOT EDIT (digest: 9447634e471ff36ecbbe488ac208b4aa) *)
 (*
    Regenerated by OASIS v0.4.5
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6695,7 +6695,7 @@ let setup_t =
           alpha_features = ["ocamlbuild_more_args"];
           beta_features = [];
           name = "mirage";
-          version = "2.7.2";
+          version = "2.7.3";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -6888,7 +6888,7 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.5";
-     oasis_digest = Some "\030\b§\138[b:=V´\141l\007\022\156\156";
+     oasis_digest = Some "ø\132x\137.èÎy¿\156\153î.B\159ý";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false