Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mirage/mirage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: af85b6593cb6
Choose a base ref
...
head repository: mirage/mirage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: df595cf82553
Choose a head ref
  • 6 commits
  • 7 files changed
  • 2 contributors

Commits on Mar 20, 2016

  1. Add a --warn-error configuration flag.

    By default it is set to [false], to avoid the regression introduced in 2.7.1
    samoht committed Mar 20, 2016
    Copy the full SHA
    221de08 View commit details
  2. Bump version

    samoht committed Mar 20, 2016
    Copy the full SHA
    9c65c2c View commit details
  3. Update autogen files

    samoht committed Mar 20, 2016
    Copy the full SHA
    61f5928 View commit details
  4. Update CHANGES

    samoht committed Mar 20, 2016
    Copy the full SHA
    0023ac4 View commit details
  5. Fix typo in doc

    samoht committed Mar 20, 2016
    Copy the full SHA
    c01f931 View commit details
  6. Merge pull request #522 from samoht/master

    Fix another regression. Oh well...
    samoht committed Mar 20, 2016
    Copy the full SHA
    df595cf View commit details
Showing with 35 additions and 12 deletions.
  1. +10 −1 CHANGES.md
  2. +1 −1 _oasis
  3. +3 −3 lib/META
  4. +8 −4 lib/mirage.ml
  5. +6 −0 lib/mirage_key.ml
  6. +4 −0 lib/mirage_key.mli
  7. +3 −3 setup.ml
11 changes: 10 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion _oasis
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions lib/META
Original file line number Diff line number Diff line change
@@ -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"
12 changes: 8 additions & 4 deletions lib/mirage.ml
Original file line number Diff line number Diff line change
@@ -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 =
6 changes: 6 additions & 0 deletions lib/mirage_key.ml
Original file line number Diff line number Diff line change
@@ -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 =
4 changes: 4 additions & 0 deletions lib/mirage_key.mli
Original file line number Diff line number Diff line change
@@ -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. *)

6 changes: 3 additions & 3 deletions setup.ml
Original file line number Diff line number Diff line change
@@ -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