Merge pull request #2850 from OCamlPro/2.0-beta2

Bump version to beta2

CHANGES

@@ -2,6 +2,10 @@ Changes prefixed with "(*)" are potentially breaking to scripts or existing
 repositories (changes that are automatically handled by the format upgrade tools
 are not marked).
 
+2.0~beta2
+* Fixes (mainly to `opam build`)
+* Faster coinstallability check
+
 2.0~beta
 * New, by-hash package archive caching system
 * Simpler HTTP repository update

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for opam 2.0.0~beta.
+# Generated by GNU Autoconf 2.69 for opam 2.0.0~beta2.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -578,8 +578,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='opam'
 PACKAGE_TARNAME='opam'
-PACKAGE_VERSION='2.0.0~beta'
-PACKAGE_STRING='opam 2.0.0~beta'
+PACKAGE_VERSION='2.0.0~beta2'
+PACKAGE_STRING='opam 2.0.0~beta2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1231,7 +1231,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures opam 2.0.0~beta to adapt to many kinds of systems.
+\`configure' configures opam 2.0.0~beta2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1293,7 +1293,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of opam 2.0.0~beta:";;
+     short | recursive ) echo "Configuration of opam 2.0.0~beta2:";;
    esac
   cat <<\_ACEOF
 
@@ -1385,7 +1385,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-opam configure 2.0.0~beta
+opam configure 2.0.0~beta2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1442,7 +1442,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by opam $as_me 2.0.0~beta, which was
+It was created by opam $as_me 2.0.0~beta2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -5072,7 +5072,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by opam $as_me 2.0.0~beta, which was
+This file was extended by opam $as_me 2.0.0~beta2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5125,7 +5125,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-opam config.status 2.0.0~beta
+opam config.status 2.0.0~beta2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(opam,2.0.0~beta)
+AC_INIT(opam,2.0.0~beta2)
 AC_COPYRIGHT(Copyright 2012-2017 OcamlPro SAS)
 
 AC_CONFIG_MACRO_DIR([m4])

opam-client.opam

@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.0~beta"
+version: "2.0.0~beta2"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Thomas Gazagnaire <thomas@gazagnaire.org>"
@@ -20,8 +20,8 @@ build: [
   [make "%{name}%.install"]
 ]
 depends: [
-  "opam-state" {= "2.0.0~beta"}
-  "opam-solver" {= "2.0.0~beta"}
+  "opam-state" {= "2.0.0~beta2"}
+  "opam-solver" {= "2.0.0~beta2"}
   "cmdliner" {>= "0.9.8"}
 ]
 available: ocaml-version >= "4.01.0"

opam-core.opam

@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.0~beta"
+version: "2.0.0~beta2"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Thomas Gazagnaire <thomas@gazagnaire.org>"

opam-devel.opam

@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.0~beta"
+version: "2.0.0~beta2"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Thomas Gazagnaire <thomas@gazagnaire.org>"
@@ -21,7 +21,7 @@ build: [
 ]
 build-test: [make "tests"]
 depends: [
-  "opam-client" {= "2.0.0~beta"}
+  "opam-client" {= "2.0.0~beta2"}
   "cmdliner" {>= "0.9.8"}
 ]
 post-messages: [

opam-format.opam

@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.0~beta"
+version: "2.0.0~beta2"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Thomas Gazagnaire <thomas@gazagnaire.org>"
@@ -20,7 +20,7 @@ build: [
   [make "%{name}%.install"]
 ]
 depends: [
-  "opam-core" {= "2.0.0~beta"}
-  "opam-file-format" {>= "2.0.0~beta"}
+  "opam-core" {= "2.0.0~beta2"}
+  "opam-file-format" {>= "2.0.0~beta2"}
 ]
 available: ocaml-version >= "4.01.0"

opam-repository.opam

@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.0~beta"
+version: "2.0.0~beta2"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Thomas Gazagnaire <thomas@gazagnaire.org>"
@@ -20,7 +20,7 @@ build: [
   [make "%{name}%.install"]
 ]
 depends: [
-  "opam-core" {= "2.0.0~beta"}
-  "opam-format" {= "2.0.0~beta"}
+  "opam-core" {= "2.0.0~beta2"}
+  "opam-format" {= "2.0.0~beta2"}
 ]
 available: ocaml-version >= "4.01.0"

opam-solver.opam

@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.0~beta"
+version: "2.0.0~beta2"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Thomas Gazagnaire <thomas@gazagnaire.org>"
@@ -20,8 +20,8 @@ build: [
   [make "%{name}%.install"]
 ]
 depends: [
-  "opam-core" {= "2.0.0~beta"}
-  "opam-format" {= "2.0.0~beta"}
+  "opam-core" {= "2.0.0~beta2"}
+  "opam-format" {= "2.0.0~beta2"}
   "dose3" {>= "5"}
 ]
 available: ocaml-version >= "4.01.0"

opam-state.opam

@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.0~beta"
+version: "2.0.0~beta2"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Thomas Gazagnaire <thomas@gazagnaire.org>"
@@ -20,8 +20,8 @@ build: [
   [make "%{name}%.install"]
 ]
 depends: [
-  "opam-core" {= "2.0.0~beta"}
-  "opam-format" {= "2.0.0~beta"}
-  "opam-repository" {= "2.0.0~beta"}
+  "opam-core" {= "2.0.0~beta2"}
+  "opam-format" {= "2.0.0~beta2"}
+  "opam-repository" {= "2.0.0~beta2"}
 ]
 available: ocaml-version >= "4.01.0"

src/client/opamAdminRepoUpgrade.ml

@@ -205,15 +205,6 @@ let do_upgrade repo_root =
 
       let opam = OpamFile.Comp.to_package ~package:nv comp descr in
       let opam = O.with_conflict_class [ocaml_conflict_class] opam in
-      let opam =
-        if variant = None then
-          opam |>
-          O.with_conflicts (OpamFormula.ors [
-              Atom (ocaml_system_pkgname, Empty);
-              Atom (ocaml_variants_pkgname, Empty);
-            ])
-        else opam
-      in
       let opam =
         match OpamFile.OPAM.url opam with
         | Some urlf when OpamFile.URL.checksum urlf = [] ->
@@ -274,10 +265,6 @@ let do_upgrade repo_root =
             None
           ] |>
           O.with_conflict_class [ocaml_conflict_class] |>
-          O.with_conflicts (OpamFormula.ors [
-              Atom (ocaml_official_pkgname, Empty);
-              Atom (ocaml_variants_pkgname, Empty);
-            ]) |>
           O.with_depends (OpamFormula.ands (
               List.map (fun name -> Atom (OpamPackage.Name.of_string name, Empty))
                 ["base-unix"; "base-threads"; "base-bigarray"]