Merge PR #10844: Bump version number to 8.11.

Reviewed-by: JasonGross
Reviewed-by: Zimmi48
Reviewed-by: ejgallego

16 files changed, 83 insertions, 57 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b2b6dda6ab..0ebf69f50f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -323,7 +323,7 @@ pkg:opam:
     - opam pin add --kind=path coqide.$COQ_VERSION .
     - set +e
   variables:
-    COQ_VERSION: "8.10"
+    COQ_VERSION: "8.11"
     OPAM_SWITCH: "edge"
     OPAM_VARIANT: "+flambda"
   only: *full-ci
diff --git a/META.coq.in b/META.coq.in
index f7922e0ac2..0baacbc82e 100644
--- a/META.coq.in
+++ b/META.coq.in
@@ -1,7 +1,7 @@
 # TODO: Generate automatically with Dune
 
 description = "The Coq Proof Assistant Plugin API"
-version = "8.10"
+version = "8.11"
 
 directory = ""
 requires = ""
@@ -9,7 +9,7 @@ requires = ""
 package "config" (
 
   description = "Coq Configuration Variables"
-  version     = "8.10"
+  version     = "8.11"
 
   directory   = "config"
 
@@ -19,7 +19,7 @@ package "config" (
 
 package "clib" (
   description = "Base General Coq Library"
-  version     = "8.10"
+  version     = "8.11"
 
   directory   = "clib"
   requires    = "str, unix, threads"
@@ -31,7 +31,7 @@ package "clib" (
 package "lib" (
 
   description = "Base Coq-Specific Library"
-  version     = "8.10"
+  version     = "8.11"
 
   directory   = "lib"
 
@@ -45,7 +45,7 @@ package "lib" (
 package "vm" (
 
   description = "Coq VM"
-  version     = "8.10"
+  version     = "8.11"
 
   directory        = "kernel/byterun"
 
@@ -64,7 +64,7 @@ package "vm" (
 package "kernel" (
 
   description = "Coq's Kernel"
-  version     = "8.10"
+  version     = "8.11"
 
   directory   = "kernel"
 
@@ -78,7 +78,7 @@ package "kernel" (
 package "library" (
 
   description = "Coq Libraries (vo) support"
-  version     = "8.10"
+  version     = "8.11"
 
   requires    = "coq.kernel"
 
@@ -92,7 +92,7 @@ package "library" (
 package "engine" (
 
   description = "Coq Tactic Engine"
-  version     = "8.10"
+  version     = "8.11"
 
   requires    = "coq.library"
   directory   = "engine"
@@ -105,7 +105,7 @@ package "engine" (
 package "pretyping" (
 
   description = "Coq Pretyper"
-  version     = "8.10"
+  version     = "8.11"
 
   requires    = "coq.engine"
   directory   = "pretyping"
@@ -118,7 +118,7 @@ package "pretyping" (
 package "interp" (
 
   description = "Coq Term Interpretation"
-  version     = "8.10"
+  version     = "8.11"
 
   requires    = "coq.pretyping"
   directory   = "interp"
@@ -131,7 +131,7 @@ package "interp" (
 package "proofs" (
 
   description = "Coq Proof Engine"
-  version     = "8.10"
+  version     = "8.11"
 
   requires    = "coq.interp"
   directory   = "proofs"
@@ -144,7 +144,7 @@ package "proofs" (
 package "gramlib" (
 
   description = "Coq Grammar Engine"
-  version     = "8.10"
+  version     = "8.11"
 
   requires    = "coq.lib"
   directory   = "gramlib/.pack"
@@ -156,7 +156,7 @@ package "gramlib" (
 package "parsing" (
 
   description = "Coq Parsing Engine"
-  version     = "8.10"
+  version     = "8.11"
 
   requires    = "coq.gramlib, coq.proofs"
   directory   = "parsing"
@@ -169,7 +169,7 @@ package "parsing" (
 package "printing" (
 
   description = "Coq Printing Engine"
-  version     = "8.10"
+  version     = "8.11"
 
   requires    = "coq.parsing"
   directory   = "printing"
@@ -182,7 +182,7 @@ package "printing" (
 package "tactics" (
 
   description = "Coq Basic Tactics"
-  version     = "8.10"
+  version     = "8.11"
 
   requires    = "coq.printing"
   directory   = "tactics"
@@ -195,7 +195,7 @@ package "tactics" (
 package "vernac" (
 
   description = "Coq Vernacular Interpreter"
-  version     = "8.10"
+  version     = "8.11"
 
   requires    = "coq.tactics"
   directory   = "vernac"
@@ -208,7 +208,7 @@ package "vernac" (
 package "stm" (
 
   description = "Coq State Transactional Machine"
-  version     = "8.10"
+  version     = "8.11"
 
   requires    = "coq.vernac"
   directory   = "stm"
@@ -221,7 +221,7 @@ package "stm" (
 package "toplevel" (
 
   description = "Coq Toplevel"
-  version     = "8.10"
+  version     = "8.11"
 
   requires    = "num, coq.stm"
   directory   = "toplevel"
@@ -234,7 +234,7 @@ package "toplevel" (
 package "idetop" (
 
   description = "Coq IDE Libraries"
-  version     = "8.10"
+  version     = "8.11"
 
   requires    = "coq.toplevel"
   directory   = "ide"
@@ -247,7 +247,7 @@ package "idetop" (
 package "ide" (
 
   description = "Coq IDE Libraries"
-  version     = "8.10"
+  version     = "8.11"
 
   requires    = "coq.lib, coq.ideprotocol, lablgtk3, lablgtk3-sourceview3"
   directory   = "ide"
@@ -260,7 +260,7 @@ package "ide" (
 package "ideprotocol" (
 
   description = "Coq IDE protocol"
-  version     = "8.10"
+  version     = "8.11"
 
   requires    = "coq.toplevel"
   directory   = "ide/protocol"
@@ -273,14 +273,14 @@ package "ideprotocol" (
 package "plugins" (
 
   description = "Coq built-in plugins"
-  version     = "8.10"
+  version     = "8.11"
 
   directory   = "plugins"
 
   package "ltac" (
 
     description = "Coq LTAC Plugin"
-    version     = "8.10"
+    version     = "8.11"
 
     requires    = "coq.stm"
     directory   = "ltac"
@@ -293,7 +293,7 @@ package "plugins" (
   package "tauto" (
 
     description = "Coq tauto plugin"
-    version     = "8.10"
+    version     = "8.11"
 
     requires    = "coq.plugins.ltac"
     directory   = "ltac"
@@ -305,7 +305,7 @@ package "plugins" (
   package "omega" (
 
     description = "Coq omega plugin"
-    version     = "8.10"
+    version     = "8.11"
 
     requires    = "coq.plugins.ltac"
     directory   = "omega"
@@ -317,7 +317,7 @@ package "plugins" (
   package "micromega" (
 
     description = "Coq micromega plugin"
-    version     = "8.10"
+    version     = "8.11"
 
     requires    = "num,coq.plugins.ltac"
     directory   = "micromega"
@@ -329,7 +329,7 @@ package "plugins" (
   package "setoid_ring" (
 
     description = "Coq newring plugin"
-    version     = "8.10"
+    version     = "8.11"
 
     requires    = ""
     directory   = "setoid_ring"
@@ -341,7 +341,7 @@ package "plugins" (
   package "extraction" (
 
     description = "Coq extraction plugin"
-    version     = "8.10"
+    version     = "8.11"
 
     requires    = "coq.plugins.ltac"
     directory   = "extraction"
@@ -353,7 +353,7 @@ package "plugins" (
   package "cc" (
 
     description = "Coq cc plugin"
-    version     = "8.10"
+    version     = "8.11"
 
     requires    = "coq.plugins.ltac"
     directory   = "cc"
@@ -365,7 +365,7 @@ package "plugins" (
   package "firstorder" (
 
     description = "Coq ground plugin"
-    version     = "8.10"
+    version     = "8.11"
 
     requires    = "coq.plugins.ltac"
     directory   = "firstorder"
@@ -377,7 +377,7 @@ package "plugins" (
   package "rtauto" (
 
     description = "Coq rtauto plugin"
-    version     = "8.10"
+    version     = "8.11"
 
     requires    = "coq.plugins.ltac"
     directory   = "rtauto"
@@ -389,7 +389,7 @@ package "plugins" (
   package "btauto" (
 
     description = "Coq btauto plugin"
-    version     = "8.10"
+    version     = "8.11"
 
     requires    = "coq.plugins.ltac"
     directory   = "btauto"
@@ -401,7 +401,7 @@ package "plugins" (
   package "funind" (
 
     description = "Coq recdef plugin"
-    version     = "8.10"
+    version     = "8.11"
 
     requires    = "coq.plugins.extraction"
     directory   = "funind"
@@ -413,7 +413,7 @@ package "plugins" (
   package "nsatz" (
 
     description = "Coq nsatz plugin"
-    version     = "8.10"
+    version     = "8.11"
 
     requires    = "num,coq.plugins.ltac"
     directory   = "nsatz"
@@ -425,7 +425,7 @@ package "plugins" (
   package "rsyntax" (
 
     description = "Coq rsyntax plugin"
-    version     = "8.10"
+    version     = "8.11"
 
     requires    = ""
     directory   = "syntax"
@@ -437,7 +437,7 @@ package "plugins" (
   package "int63syntax" (
 
     description = "Coq int63syntax plugin"
-    version     = "8.10"
+    version     = "8.11"
 
     requires    = ""
     directory   = "syntax"
@@ -449,7 +449,7 @@ package "plugins" (
   package "string_notation" (
 
     description = "Coq string_notation plugin"
-    version     = "8.10"
+    version     = "8.11"
 
     requires    = ""
     directory   = "syntax"
@@ -461,7 +461,7 @@ package "plugins" (
   package "derive" (
 
     description = "Coq derive plugin"
-    version     = "8.10"
+    version     = "8.11"
 
     requires    = ""
     directory   = "derive"
@@ -473,7 +473,7 @@ package "plugins" (
   package "ssrmatching" (
 
     description = "Coq ssrmatching plugin"
-    version     = "8.10"
+    version     = "8.11"
 
     requires    = "coq.plugins.ltac"
     directory   = "ssrmatching"
@@ -485,7 +485,7 @@ package "plugins" (
   package "ssreflect" (
 
     description = "Coq ssreflect plugin"
-    version     = "8.10"
+    version     = "8.11"
 
     requires    = "coq.plugins.ssrmatching"
     directory   = "ssr"
diff --git a/configure.ml b/configure.ml
index d7370b28c1..e59a41a8d4 100644
--- a/configure.ml
+++ b/configure.ml
@@ -12,11 +12,11 @@
 #load "str.cma"
 open Printf
 
-let coq_version = "8.10+alpha"
-let coq_macos_version = "8.9.90" (** "[...] should be a string comprised of
+let coq_version = "8.11+alpha"
+let coq_macos_version = "8.10.90" (** "[...] should be a string comprised of
 three non-negative, period-separated integers [...]" *)
-let vo_magic = 8991
-let state_magic = 58991
+let vo_magic = 81091
+let state_magic = 581091
 let is_a_released_version = false
 let distributed_exec =
   ["coqtop.opt"; "coqidetop.opt"; "coqqueryworker.opt"; "coqproofworker.opt"; "coqtacticworker.opt";
diff --git a/default.nix b/default.nix
index 2d101eed57..19afc2bd1b 100644
--- a/default.nix
+++ b/default.nix
@@ -29,7 +29,7 @@
 , shell ? false
   # We don't use lib.inNixShell because that would also apply
   # when in a nix-shell of some package depending on this one.
-, coq-version ? "8.10-git"
+, coq-version ? "8.11-git"
 }:
 
 with pkgs;
diff --git a/doc/stdlib/index-list.html.template b/doc/stdlib/index-list.html.template
index d1b98b94a3..75c8c6c1ea 100644
--- a/doc/stdlib/index-list.html.template
+++ b/doc/stdlib/index-list.html.template
@@ -627,5 +627,6 @@ through the <tt>Require Import</tt> command.</p>
     theories/Compat/Coq88.v
     theories/Compat/Coq89.v
     theories/Compat/Coq810.v
+    theories/Compat/Coq811.v
   </dd>
 </dl>
diff --git a/lib/flags.ml b/lib/flags.ml
index f09dc48f5d..7676665fe9 100644
--- a/lib/flags.ml
+++ b/lib/flags.ml
@@ -60,7 +60,7 @@ let we_are_parsing = ref false
 (* Current means no particular compatibility consideration.
    For correct comparisons, this constructor should remain the last one. *)
 
-type compat_version = V8_8 | V8_9 | Current
+type compat_version = V8_8 | V8_9 | V8_10 | Current
 
 let compat_version = ref Current
 
@@ -71,6 +71,9 @@ let version_compare v1 v2 = match v1, v2 with
   | V8_9, V8_9 -> 0
   | V8_9, _ -> -1
   | _, V8_9 -> 1
+  | V8_10, V8_10 -> 0
+  | V8_10, _ -> -1
+  | _, V8_10 -> 1
   | Current, Current -> 0
 
 let version_strictly_greater v = version_compare !compat_version v > 0
@@ -79,6 +82,7 @@ let version_less_or_equal v = not (version_strictly_greater v)
 let pr_version = function
   | V8_8 -> "8.8"
   | V8_9 -> "8.9"
+  | V8_10 -> "8.10"
   | Current -> "current"
 
 (* Translate *)
diff --git a/lib/flags.mli b/lib/flags.mli
index 185a5f8425..3f72cc4b91 100644
--- a/lib/flags.mli
+++ b/lib/flags.mli
@@ -48,7 +48,7 @@ val we_are_parsing : bool ref
 (* Set Printing All flag. For some reason it is a global flag *)
 val raw_print : bool ref
 
-type compat_version = V8_8 | V8_9 | Current
+type compat_version = V8_8 | V8_9 | V8_10 | Current
 val compat_version : compat_version ref
 val version_compare : compat_version -> compat_version -> int
 val version_strictly_greater : compat_version -> bool
diff --git a/test-suite/success/CompatCurrentFlag.v b/test-suite/success/CompatCurrentFlag.v
index 81469d79c3..fd6101bf89 100644
--- a/test-suite/success/CompatCurrentFlag.v
+++ b/test-suite/success/CompatCurrentFlag.v
@@ -1,3 +1,3 @@
-(* -*- coq-prog-args: ("-compat" "8.10") -*- *)
+(* -*- coq-prog-args: ("-compat" "8.11") -*- *)
 (** Check that the current compatibility flag actually requires the relevant modules. *)
-Import Coq.Compat.Coq810.
+Import Coq.Compat.Coq811.
diff --git a/test-suite/success/CompatOldFlag.v b/test-suite/success/CompatOldFlag.v
index afeb57f9f2..f774cef44f 100644
--- a/test-suite/success/CompatOldFlag.v
+++ b/test-suite/success/CompatOldFlag.v
@@ -1,5 +1,5 @@
-(* -*- coq-prog-args: ("-compat" "8.8") -*- *)
+(* -*- coq-prog-args: ("-compat" "8.9") -*- *)
 (** Check that the current-minus-two compatibility flag actually requires the relevant modules. *)
+Import Coq.Compat.Coq811.
 Import Coq.Compat.Coq810.
 Import Coq.Compat.Coq89.
-Import Coq.Compat.Coq88.
diff --git a/test-suite/success/CompatOldOldFlag.v b/test-suite/success/CompatOldOldFlag.v
new file mode 100644
index 0000000000..20eef955b4
--- /dev/null
+++ b/test-suite/success/CompatOldOldFlag.v
@@ -0,0 +1,6 @@
+(* -*- coq-prog-args: ("-compat" "8.8") -*- *)
+(** Check that the current-minus-three compatibility flag actually requires the relevant modules. *)
+Import Coq.Compat.Coq811.
+Import Coq.Compat.Coq810.
+Import Coq.Compat.Coq89.
+Import Coq.Compat.Coq88.
diff --git a/test-suite/success/CompatPreviousFlag.v b/test-suite/success/CompatPreviousFlag.v
index c8f75915c8..1c5ccc1a92 100644
--- a/test-suite/success/CompatPreviousFlag.v
+++ b/test-suite/success/CompatPreviousFlag.v
@@ -1,4 +1,4 @@
-(* -*- coq-prog-args: ("-compat" "8.9") -*- *)
+(* -*- coq-prog-args: ("-compat" "8.10") -*- *)
 (** Check that the current-minus-one compatibility flag actually requires the relevant modules. *)
+Import Coq.Compat.Coq811.
 Import Coq.Compat.Coq810.
-Import Coq.Compat.Coq89.
diff --git a/test-suite/tools/update-compat/run.sh b/test-suite/tools/update-compat/run.sh
index 7ff5571ffb..61273c4f37 100755
--- a/test-suite/tools/update-compat/run.sh
+++ b/test-suite/tools/update-compat/run.sh
@@ -6,4 +6,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 # we assume that the script lives in test-suite/tools/update-compat/,
 # and that update-compat.py lives in dev/tools/
 cd "${SCRIPT_DIR}/../../.."
-dev/tools/update-compat.py --assert-unchanged --release || exit $?
+dev/tools/update-compat.py --assert-unchanged --master || exit $?
diff --git a/theories/Compat/Coq810.v b/theories/Compat/Coq810.v
index d24af2186f..c611d356ce 100644
--- a/theories/Compat/Coq810.v
+++ b/theories/Compat/Coq810.v
@@ -9,3 +9,5 @@
 (************************************************************************)
 
 (** Compatibility file for making Coq act similar to Coq v8.10 *)
+
+Require Export Coq.Compat.Coq811.
diff --git a/theories/Compat/Coq811.v b/theories/Compat/Coq811.v
new file mode 100644
index 0000000000..4a9a041d4e
--- /dev/null
+++ b/theories/Compat/Coq811.v
@@ -0,0 +1,11 @@
+(************************************************************************)
+(*         *   The Coq Proof Assistant / The Coq Development Team       *)
+(*  v      *   INRIA, CNRS and contributors - Copyright 1999-2019       *)
+(* <O___,, *       (see CREDITS file for the list of authors)           *)
+(*   \VV/  **************************************************************)
+(*    //   *    This file is distributed under the terms of the         *)
+(*         *     GNU Lesser General Public License Version 2.1          *)
+(*         *     (see LICENSE file for the text of the license)         *)
+(************************************************************************)
+
+(** Compatibility file for making Coq act similar to Coq v8.11 *)
diff --git a/toplevel/coqargs.ml b/toplevel/coqargs.ml
index 113b1fb5d7..ba69035758 100644
--- a/toplevel/coqargs.ml
+++ b/toplevel/coqargs.ml
@@ -178,7 +178,8 @@ let add_compat_require opts v =
   match v with
   | Flags.V8_8 -> add_vo_require opts "Coq.Compat.Coq88" None (Some false)
   | Flags.V8_9 -> add_vo_require opts "Coq.Compat.Coq89" None (Some false)
-  | Flags.Current -> add_vo_require opts "Coq.Compat.Coq810" None (Some false)
+  | Flags.V8_10 -> add_vo_require opts "Coq.Compat.Coq810" None (Some false)
+  | Flags.Current -> add_vo_require opts "Coq.Compat.Coq811" None (Some false)
 
 let add_load_vernacular opts verb s =
   { opts with pre = { opts.pre with load_vernacular_list = (CUnix.make_suffix s ".v",verb) :: opts.pre.load_vernacular_list }}
diff --git a/vernac/g_vernac.mlg b/vernac/g_vernac.mlg
index 8a94a010a0..efcb2635be 100644
--- a/vernac/g_vernac.mlg
+++ b/vernac/g_vernac.mlg
@@ -62,7 +62,8 @@ let make_bullet s =
   | _ -> assert false
 
 let parse_compat_version = let open Flags in function
-  | "8.10" -> Current
+  | "8.11" -> Current
+  | "8.10" -> V8_10
   | "8.9" -> V8_9
   | "8.8" -> V8_8
   | ("8.7" | "8.6" | "8.5" | "8.4" | "8.3" | "8.2" | "8.1" | "8.0") as s ->