Use OCAML_COLOR environment variable for deciding whether to use colors in output

Changes

@@ -38,6 +38,13 @@ Working version
   a trailing "Error: Some fatal warnings were triggered" message.
   (Valentin Gatien-Baron, review by Alain Frisch)
 
+- GPR#1098: the compiler now takes the boolean "OCAML_COLOR" environment
+  variable into account if "-color" is not provided.  This allows users
+  to override the default behaviour without modifying invocations of ocaml
+  manually.
+  (Hannes Mehnert, Guillaume Bury,
+   review by Daniel Bünzli, Gabriel Scherer, Damien Doligez)
+
 ### Tools:
 
 - GPR#1045: ocamldep, add a "-shared" option to generate dependencies

driver/compenv.ml

@@ -338,7 +338,7 @@ let read_one_param ppf position name v =
           (Warnings.Bad_env_variable ("OCAMLPARAM",
            "bad value for \"color\", \
             (expected \"auto\", \"always\" or \"never\")"))
-      | Some setting -> color := setting
+      | Some setting -> color := Some setting
       end
 
   | "intf-suffix" -> Config.interface_suffix := v

driver/compmisc.ml

@@ -60,3 +60,18 @@ let initial_env () =
   List.fold_left (fun env m ->
     open_implicit_module m env
   ) env (!implicit_modules @ List.rev !Clflags.open_modules)
+
+
+let read_color_env ppf =
+  try
+    match Clflags.parse_color_setting (Sys.getenv "OCAML_COLOR") with
+    | None ->
+        Location.print_warning Location.none ppf
+          (Warnings.Bad_env_variable
+             ("OCAML_COLOR",
+              "expected \"auto\", \"always\" or \"never\""));
+    | Some x -> match !Clflags.color with
+      | None -> Clflags.color := Some x
+      | Some _ -> ()
+  with
+    Not_found -> ()

driver/compmisc.mli

@@ -15,3 +15,5 @@
 
 val init_path : ?dir:string -> bool -> unit
 val initial_env : unit -> Env.t
+
+val read_color_env : Format.formatter -> unit

driver/main.ml

@@ -104,9 +104,9 @@ module Options = Main_args.Make_bytecomp_options (struct
   let _warn_error = (Warnings.parse_options true)
   let _warn_help = Warnings.help_warnings
   let _color option =
-    begin match Clflags.parse_color_setting option with
+    begin match parse_color_setting option with
           | None -> ()
-          | Some setting -> Clflags.color := setting
+          | Some setting -> color := Some setting
     end
   let _where = print_standard_library
   let _verbose = set verbose
@@ -130,6 +130,7 @@ let main () =
   try
     readenv ppf Before_args;
     Clflags.parse_arguments anonymous usage;
+    Compmisc.read_color_env ppf;
     begin try
       Compenv.process_deferred_actions
         (ppf,

driver/optmain.ml

@@ -188,9 +188,9 @@ module Options = Main_args.Make_optcomp_options (struct
   let _warn_error s = Warnings.parse_options true s
   let _warn_help = Warnings.help_warnings
   let _color option =
-    begin match Clflags.parse_color_setting option with
+    begin match parse_color_setting option with
           | None -> ()
-          | Some setting -> Clflags.color := setting
+          | Some setting -> color := Some setting
     end
   let _where () = print_standard_library ()
 
@@ -240,6 +240,7 @@ let main () =
     readenv ppf Before_args;
     Clflags.add_arguments __LOC__ (Arch.command_line_options @ Options.list);
     Clflags.parse_arguments anonymous usage;
+    Compmisc.read_color_env ppf;
     if !gprofile && not Config.profiling then
       fatal "Profiling with \"gprof\" is not supported on this platform.";
     begin try

man/ocamlc.m

@@ -282,6 +282,9 @@ use heuristics to enable colors only if the output supports them (an
 checks that the "TERM" environment variable exists and is
 not empty or "dumb", and that isatty(stderr) holds.
 
+The environment variable "OCAML_COLOR" is considered if \-color is not
+provided. Its values are auto/always/never as above.
+
 .TP
 .B \-compat\-32
 Check that the generated bytecode executable can run on 32-bit

man/ocamlopt.m

@@ -217,6 +217,30 @@ Dump detailed information about the compilation (types, bindings,
 causes the C linker to search for C libraries in
 directory
 .IR dir .
+.TP
+.BI \-color \ mode
+Enable or disable colors in compiler messages (especially warnings and errors).
+The following modes are supported:
+
+.B auto
+use heuristics to enable colors only if the output supports them (an
+ANSI-compatible tty terminal);
+
+.B always
+enable colors unconditionally;
+
+.B never
+disable color output.
+
+The default setting is
+.B auto,
+and the current heuristic
+checks that the "TERM" environment variable exists and is
+not empty or "dumb", and that isatty(stderr) holds.
+
+The environment variable "OCAML_COLOR" is considered if \-color is not
+provided. Its values are auto/always/never as above.
+
 .TP
 .B \-compact
 Optimize the produced code for space rather than for time. This

manual/manual/cmds/unified-options.etex

@@ -131,6 +131,9 @@ The following modes are supported:
 The default setting is 'auto', and the current heuristic
 checks that the "TERM" environment variable exists and is
 not empty or "dumb", and that 'isatty(stderr)' holds.
+
+The environment variable "OCAML_COLOR" is considered if "-color" is not
+provided. Its values are auto/always/never as above.
 }%notop
 
 \comp{%

utils/clflags.ml

@@ -360,7 +360,7 @@ let parse_color_setting = function
   | "always" -> Some Misc.Color.Always
   | "never" -> Some Misc.Color.Never
   | _ -> None
-let color = ref Misc.Color.Auto ;; (* -color *)
+let color = ref None ;; (* -color *)
 
 let unboxed_types = ref false
 

utils/clflags.mli

@@ -203,7 +203,7 @@ val dumped_pass : string -> bool
 val set_dumped_pass : string -> bool -> unit
 
 val parse_color_setting : string -> Misc.Color.setting option
-val color : Misc.Color.setting ref
+val color : Misc.Color.setting option ref
 
 val unboxed_types : bool ref
 

utils/misc.ml

@@ -601,10 +601,10 @@ module Color = struct
         Format.set_mark_tags true;
         List.iter set_color_tag_handling formatter_l;
         color_enabled := (match o with
-          | Always -> true
-          | Auto -> should_enable_color ()
-          | Never -> false
-        )
+            | Some Always -> true
+            | Some Auto -> should_enable_color ()
+            | Some Never -> false
+            | None -> should_enable_color ())
       );
       ()
 end

utils/misc.mli

@@ -277,7 +277,7 @@ module Color : sig
 
   type setting = Auto | Always | Never
 
-  val setup : setting -> unit
+  val setup : setting option -> unit
   (* [setup opt] will enable or disable color handling on standard formatters
      according to the value of color setting [opt].
      Only the first call to this function has an effect. *)