From e86ea688f84a91b20b7f213bbd8152ee106c124f Mon Sep 17 00:00:00 2001 From: Raja Boujbel Date: Fri, 21 Jul 2023 18:42:43 +0200 Subject: [PATCH 1/2] Bump version to 2.2.0~alpha2 --- configure | 18 +++++++++--------- configure.ac | 2 +- opam-client.opam | 2 +- opam-core.opam | 2 +- opam-devel.opam | 2 +- opam-format.opam | 2 +- opam-installer.opam | 2 +- opam-repository.opam | 2 +- opam-solver.opam | 2 +- opam-state.opam | 2 +- opam.opam | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/configure b/configure index 16c737c8a10..20db942733c 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for opam 2.2.0~alpha2~dev. +# Generated by GNU Autoconf 2.71 for opam 2.2.0~alpha2. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -609,8 +609,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='opam' PACKAGE_TARNAME='opam' -PACKAGE_VERSION='2.2.0~alpha2~dev' -PACKAGE_STRING='opam 2.2.0~alpha2~dev' +PACKAGE_VERSION='2.2.0~alpha2' +PACKAGE_STRING='opam 2.2.0~alpha2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1335,7 +1335,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.2.0~alpha2~dev to adapt to many kinds of systems. +\`configure' configures opam 2.2.0~alpha2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1397,7 +1397,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of opam 2.2.0~alpha2~dev:";; + short | recursive ) echo "Configuration of opam 2.2.0~alpha2:";; esac cat <<\_ACEOF @@ -1510,7 +1510,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -opam configure 2.2.0~alpha2~dev +opam configure 2.2.0~alpha2 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1707,7 +1707,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.2.0~alpha2~dev, which was +It was created by opam $as_me 2.2.0~alpha2, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -7900,7 +7900,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.2.0~alpha2~dev, which was +This file was extended by opam $as_me 2.2.0~alpha2, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7955,7 +7955,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -opam config.status 2.2.0~alpha2~dev +opam config.status 2.2.0~alpha2 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index b520ba2740d..eff9539e4b5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl The line below must be formatted AC_INIT([opam],[VERSION]) with no extra spaces -AC_INIT([opam],[2.2.0~alpha2~dev]) +AC_INIT([opam],[2.2.0~alpha2]) AC_COPYRIGHT(Copyright 2012-2019 OcamlPro SAS) AC_CONFIG_MACRO_DIR([m4]) diff --git a/opam-client.opam b/opam-client.opam index 7e8ef63dffe..a8b505733c0 100644 --- a/opam-client.opam +++ b/opam-client.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.2.0~alpha2~dev" +version: "2.2.0~alpha2" synopsis: "Client library for opam 2.2" description: """ Actions on the opam root, switches, installations, and front-end. diff --git a/opam-core.opam b/opam-core.opam index c78af6ef391..ab75c3f5e6a 100644 --- a/opam-core.opam +++ b/opam-core.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.2.0~alpha2~dev" +version: "2.2.0~alpha2" synopsis: "Core library for opam 2.2" description: """ Small standard library extensions, and generic system interaction modules used by opam. diff --git a/opam-devel.opam b/opam-devel.opam index a47d334b317..3ba16b788bb 100644 --- a/opam-devel.opam +++ b/opam-devel.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.2.0~alpha2~dev" +version: "2.2.0~alpha2" synopsis: "Bootstrapped development binary for opam 2.2" description: """ This package compiles (bootstraps) opam. For consistency and safety of the installation, the binaries are not installed into the PATH, but into lib/opam-devel, from where the user can manually install them system-wide. diff --git a/opam-format.opam b/opam-format.opam index 00f618f716a..e26e281802e 100644 --- a/opam-format.opam +++ b/opam-format.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.2.0~alpha2~dev" +version: "2.2.0~alpha2" synopsis: "Format library for opam 2.2" description: """ Definition of opam datastructures and its file interface. diff --git a/opam-installer.opam b/opam-installer.opam index 960735cc1f5..17a5efa960e 100644 --- a/opam-installer.opam +++ b/opam-installer.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.2.0~alpha2~dev" +version: "2.2.0~alpha2" synopsis: "Installation of files to a prefix, following opam conventions" description: """ opam-installer is a small tool that can read *.install files, as defined by opam [1], and execute them to install or remove package files without going through opam. diff --git a/opam-repository.opam b/opam-repository.opam index 8f054022d34..bb065d62410 100644 --- a/opam-repository.opam +++ b/opam-repository.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.2.0~alpha2~dev" +version: "2.2.0~alpha2" synopsis: "Repository library for opam 2.2" description: """ This library includes repository and remote sources handling, including curl/wget, rsync, git, mercurial, darcs backends. diff --git a/opam-solver.opam b/opam-solver.opam index 32a9a480ac3..3079448df8c 100644 --- a/opam-solver.opam +++ b/opam-solver.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.2.0~alpha2~dev" +version: "2.2.0~alpha2" synopsis: "Solver library for opam 2.2" description: """ Solver and Cudf interaction. This library is based on the Cudf and Dose libraries, and handles calls to the external solver from opam. diff --git a/opam-state.opam b/opam-state.opam index b52985f8859..6ade00eb55a 100644 --- a/opam-state.opam +++ b/opam-state.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.2.0~alpha2~dev" +version: "2.2.0~alpha2" synopsis: "State library for opam 2.2" description: """ Handling of the ~/.opam hierarchy, repository and switch states. diff --git a/opam.opam b/opam.opam index eca84c3bdcc..4c7ba9f3b91 100644 --- a/opam.opam +++ b/opam.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.2.0~alpha2~dev" +version: "2.2.0~alpha2" synopsis: "Meta-package for Dune" maintainer: "opam-devel@lists.ocaml.org" authors: [ From f3d2e9b3a27d14beb9d9585871521bc946c6c835 Mon Sep 17 00:00:00 2001 From: Raja Boujbel Date: Fri, 21 Jul 2023 19:07:07 +0200 Subject: [PATCH 2/2] Update CHANGES --- CHANGES | 22 ++++++++++++++++++++++ master_changes.md | 29 ----------------------------- 2 files changed, 22 insertions(+), 29 deletions(-) diff --git a/CHANGES b/CHANGES index f2c552e239e..ae29219ab3d 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,28 @@ repositories (changes that are automatically handled by the format upgrade tools are not marked). Those prefixed with "(+)" are new command/option (since 2.1.0~alpha2). +2.2.0~alpha2: +* Permit internal Cygwin install on Windows [#5545 @rjbou @dra27] +* Add `--no-cygwin-setup`, `--cygwin-internal-install`, + `--cygwin-local-install` and `--cygwin-location ` experimental flags + available only on Windows to permit non-interactive Cygwin configuration + [#5545 @rjbou] +* opam var/option: Error with more accurate message in case of package/self + variable wrongly given as argument [#4903 @rjbou - fix #4489] +* [BUG] opam var/option: Handle package variable syntax in parse update + regexp [#4903 @rjbou - fix #4489] +* Lint: E29: The conflicts field's filter does not support package variables + [#5535 @kit-ty-kate] +* opam admin: On linting, clean output when stdout is not tty [#5594 @rjbou] +* Run autoupdate to silence autogen warnings [#5555 @MisterDA] +* Update bootstrap to use FlexDLL 0.43 from ocaml/flexdll [#5579 @MisterDA] +* configure: Ensure a complementary (32bit on 64bit platforms and 64bit on + 32bit platforms) C compiler is installed on Windows [#5522 @kit-ty-kate] +* Bump versions, fix authors [#5603 #5609 #5611 @rjbou] +* Improve and extended tests: [#5385 #5535 @rjbou] +* Improve test engine: [#5481 @dra27] +* Improve Github actions: [#5555 #5588 #5598 @rjbou] + 2.2.0~alpha: * Depexts support Cygwin on Windows [#5542 @rjbou] [#5544 @rjbou] [#5541 @dra27] diff --git a/master_changes.md b/master_changes.md index 38bd52788ea..ff91862266f 100644 --- a/master_changes.md +++ b/master_changes.md @@ -11,17 +11,12 @@ moved, etc.), please update the _API updates_ part (it helps opam library users) ## Version - * Bump to 2.2.0~alpha2~dev [#5603 @rjbou] - * Update Kate email [#5609 @rjbou] - * Fix author heading in manpage [#5609 @rjbou] ## Global CLI ## Plugins ## Init - * Permit internal Cygwin install on Windows [#5545 @rjbou @dra27] - * Add `--no-cygwin-setup`, `--cygwin-internal-install`, `--cygwin-local-install` and `--cygwin-location ` experimental flags available only on Windows to permit non-interactive Cygwin configuration [#5545 @rjbou] ## Config report @@ -42,8 +37,6 @@ users) ## Show ## Var/Option - * Handle package variable syntax in parse update regexp [#4903 @rjbou - fix #4489] - * Error with more accurate message in case of package/self variable wrongly given as argument [#4903 @rjbou - fix #4489] ## Update / Upgrade @@ -52,7 +45,6 @@ users) ## Source ## Lint - * E29: The conflicts field's filter does not support package variables [#5535 @kit-ty-kate] ## Repository @@ -71,16 +63,12 @@ users) ## VCS ## Build - * Run autoupdate to silence autogen warnings [#5555 @MisterDA] - * Update bootstrap to use FlexDLL 0.43 from ocaml/flexdll [#5579 @MisterDA] - * configure: Ensure a complementary (32bit on 64bit platforms and 64bit on 32bit platforms) C compiler is installed on Windows [#5522 @kit-ty-kate] ## Infrastructure ## Release scripts ## Admin - * When linting, clean output when stdout is not tty [#5594 @rjbou] ## Opam installer @@ -102,17 +90,10 @@ users) ## Reftests ### Tests - * Detect change in root version when switching branches and re-build test roots [#5481 @dra27] - * Admin: add a full test [#5385 @rjbou] - * Lint - * E29: Add conflicts test and simplify W41 to no more trigger E29 [#5535 @rjbou] ### Engine ## Github Actions - * Fix hygiene scripts for install check: it was missing a conversion `~` -> `-` for dev version [#5588 @rjbou] - * Add configure autoupdate test [#5555 @rjbou] - * Fix cli version master check, introduced by #5555 [#5598 @rjbou] ## Doc @@ -120,23 +101,13 @@ users) # API updates ## opam-client - * `OpaminitDefault`: add `required_packages_for_cygwin` packages tool list [#5545 @rjbou] - * `OpamClient.init`: now propose to install internal Cygwin install [#5545 @rjbou] - * `OpamSolution.get_depext`: do not confirm in case of internal Cygwin install [#5545 @rjbou] - * `OpamClient.init`: add optional `cygwin_setup` argument to permit non interactive setup [#5545 @rjbou] - * `OpamCommands.init`: add cygwin setup flags [#5545 @rjbou] ## opam-repository ## opam-state - * `OpamSysinteract.Cygwin`: add `install` that performs a Cygwin install in opam internals [#5545 @rjbou @dra27] - * `OpamSysInteract.Cygwin`: add `is_internal` [#5545 @rjbou] - * `OpamSysInteract.install`: on Cygwin, upgrade automatically packages, and select local cache [#5545 @rjbou] ## opam-solver ## opam-format ## opam-core - * `OpamConsole.carriage_delete`: no-op when not tty out [#5595 @rjbou] - * `OpamSystem.make_command`: Remove the warning triggered when the command contained spaces [#5596 @rjbou - fix #5163]