Merge pull request #6205 from kit-ty-kate/2.3-post-2.3.0-alpha1

[2.3 backport] Post 2.3.0~alpha1 release bumps and fixes

Author: kit-ty-kate

configure

@@ -1,5 +1,5 @@
 dnl The line below must be formatted AC_INIT([opam],[VERSION]) with no extra spaces
-AC_INIT([opam],[2.3.0~alpha1])
+AC_INIT([opam],[2.3.0~alpha2~dev])
 AC_COPYRIGHT(Copyright 2012-2019 OcamlPro SAS)
 
 AC_CONFIG_MACRO_DIR([m4])

configure.ac

@@ -1,4 +1,4 @@
-(lang dune 2.6)
+(lang dune 2.8)
 (name opam)
 
 (implicit_transitive_deps true)

dune-project

@@ -11,6 +11,7 @@ moved, etc.), please update the _API updates_ part (it helps opam library
 users)
 
 ## Version
+  * Bump the version of opam to 2.3.0~alpha2~dev [#6204 @kit-ty-kate]
 
 ## Global CLI
 
@@ -69,10 +70,14 @@ users)
 ## VCS
 
 ## Build
+  * Bump the requirement for dune to 2.8 [#6204 @kit-ty-kate]
 
 ## Infrastructure
 
 ## Release scripts
+  * Fix the release script after the bump of dune lang to 2.6 [#6204 @kit-ty-kate]
+  * Fix the release script after the introduction of opam\_core\_stubs [#6204 @kit-ty-kate]
+  * Improve the release script by ignoring interactive questions asked by the FreeBSD package manager [#6204 @kit-ty-kate]
 
 ## Install script
 

master_changes.md

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~alpha1"
+version: "2.3.0~alpha2~dev"
 synopsis: "Client library for opam 2.2"
 description: """
 Actions on the opam root, switches, installations, and front-end.
@@ -35,7 +35,7 @@ depends: [
   "opam-repository" {= version}
   "re" {>= "1.10.0"}
   "cmdliner" {>= "1.1.0"}
-  "dune" {>= "2.6.0"}
+  "dune" {>= "2.8.0"}
 ]
 conflicts: [
   "extlib" {< "1.7.8"}

opam-client.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~alpha1"
+version: "2.3.0~alpha2~dev"
 synopsis: "Core library for opam 2.2"
 description:
   "Small standard library extensions, and generic system interaction modules used by opam."
@@ -26,7 +26,7 @@ depends: [
   "base-unix"
   "ocamlgraph"
   "re" {>= "1.9.0"}
-  "dune" {>= "2.6.0"}
+  "dune" {>= "2.8.0"}
   "sha" {>= "1.13"}
   "jsonm"
   "swhid_core"

opam-core.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~alpha1"
+version: "2.3.0~alpha2~dev"
 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.
@@ -31,7 +31,7 @@ depends: [
   "ocaml" {>= "4.08.0"}
   "opam-client" {= version}
   "cmdliner" {>= "1.1.0"}
-  "dune" {>= "2.6.0"}
+  "dune" {>= "2.8.0"}
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
 ]

opam-devel.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~alpha1"
+version: "2.3.0~alpha2~dev"
 synopsis: "Format library for opam 2.2"
 description: """
 Definition of opam datastructures and its file interface.
@@ -32,5 +32,5 @@ depends: [
   "opam-core" {= version}
   "opam-file-format" {>= "2.1.4"}
   "re" {>= "1.9.0"}
-  "dune" {>= "2.6.0"}
+  "dune" {>= "2.8.0"}
 ]

opam-format.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~alpha1"
+version: "2.3.0~alpha2~dev"
 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.
@@ -33,5 +33,5 @@ depends: [
   "ocaml" {>= "4.08.0"}
   "opam-format" {= version}
   "cmdliner" {>= "0.9.8"}
-  "dune" {>= "2.6.0"}
+  "dune" {>= "2.8.0"}
 ]

opam-installer.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~alpha1"
+version: "2.3.0~alpha2~dev"
 synopsis: "Repository library for opam 2.2"
 description: """
 This library includes repository and remote sources handling, including curl/wget, rsync, git, mercurial, darcs backends.
@@ -30,5 +30,5 @@ build: [
 depends: [
   "ocaml" {>= "4.08.0"}
   "opam-format" {= version}
-  "dune" {>= "2.6.0"}
+  "dune" {>= "2.8.0"}
 ]

opam-repository.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~alpha1"
+version: "2.3.0~alpha2~dev"
 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.
@@ -34,7 +34,7 @@ depends: [
   "dose3" {>= "6.1"}
   "cudf" {>= "0.7"}
   "re" {>= "1.9.0"}
-  "dune" {>= "2.6.0"}
+  "dune" {>= "2.8.0"}
   "opam-0install-cudf" {>= "0.5.0"}
 ]
 depopts: [

opam-solver.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~alpha1"
+version: "2.3.0~alpha2~dev"
 synopsis: "State library for opam 2.2"
 description: """
 Handling of the ~/.opam hierarchy, repository and switch states.
@@ -32,5 +32,5 @@ depends: [
   "opam-repository" {= version}
   "re" {>= "1.9.0"}
   "spdx_licenses" {>= "1.0.0"}
-  "dune" {>= "2.6.0"}
+  "dune" {>= "2.8.0"}
 ]

opam-state.opam

@@ -27,6 +27,7 @@ CMD { tar xz && \
       ./configure --with-vendored-deps --with-mccs && \
       echo "(${LINKING})" > src/client/linking.sexp && \
       make opam && \
+      chmod u+w _build/default/src/client/opamMain.exe && \
       strip opam ; \
     } >&2 && \
     cat opam

release/Dockerfile.in

@@ -53,22 +53,21 @@ build/%.image: build/Dockerfile.%
 # Actually, this is for alpine 3.13, and varies
 CLINKING_linux = \
 -Wl,-Bstatic \
--lunix -lmccs_stubs -lmccs_glpk_stubs -lsha_stubs \
+-lunix -lmccs_stubs -lmccs_glpk_stubs -lsha_stubs -lopam_core_stubs \
 -lstdc++ \
 -static-libgcc \
 -static
 # -Wl,-Bdynamic
 
 CLINKING_macos = \
--lunix -lmccs_stubs -lmccs_glpk_stubs -lsha_stubs \
+-lunix -lmccs_stubs -lmccs_glpk_stubs -lsha_stubs -lopam_core_stubs \
 -lstdc++
 
 CLINKING_openbsd = $(CLINKING_macos)
 CLINKING_freebsd = $(CLINKING_macos)
 
 CLINKING_windows = \
--lunix -lmccs_stubs -lmccs_glpk_stubs -lsha_stubs \
--lopam_stubs_win32_stubs \
+-lunix -lmccs_stubs -lmccs_glpk_stubs -lsha_stubs -lopam_core_stubs \
 -l:libstdc++.a -l:libpthread.a \
 -Wl,-static \
 -ladvapi32 -lgdi32 -luser32 -lshell32 -lole32 -luuid -luserenv
@@ -124,6 +123,7 @@ host: $(OUTDIR)/opam-full-$(VERSION).tar.gz build/$(HOST).env
 	  echo "$(call LINKING,$(HOST_OS))" >src/client/linking.sexp && \
 	  $(MAKE) opam; \
 	)
+	chmod u+w build/opam-full-$(VERSION)/_build/default/src/client/opamMain.exe
 	cp build/opam-full-$(VERSION)/opam $(OUTDIR)/opam-$(VERSION)-$(HOST)
 	strip $(OUTDIR)/opam-$(VERSION)-$(HOST)
 	$(OUTDIR)/opam-$(VERSION)-$(HOST) --version

release/Makefile

@@ -40,7 +40,7 @@ windows_build() {
     qemu-img convert -O raw "./${image}.qcow2" "./${image}.raw"
     # NOTE: -machine q35 seems to be required to avoid random but recurring crashes
     "qemu-system-x86_64" -drive "file=./${image}.raw,format=raw" -nic "user,hostfwd=tcp::${port}-:22" -m 6G -smp "${JOBS}" -machine q35 &
-    sleep 120
+    sleep 240
   fi
 
   # Disable Windows Defender before anything else (makes the build process faster)
@@ -90,5 +90,5 @@ make JOBS="${JOBS}" TAG="$TAG" s390x-linux
 [ -f "${OUTDIR}/opam-$TAG-arm64-macos" ] || make TAG="$TAG" JOBS="${JOBS}" macos-local MACOS_ARCH=arm64 REMOTE_DIR=opam-release-$TAG GIT_URL="$CWD/.."
 [ -d ./qemu-base-images ] || git clone https://gitlab.com/kit-ty-kate/qemu-base-images.git
 [ -f "${OUTDIR}/opam-$TAG-x86_64-openbsd" ] || qemu_build 9999 OpenBSD-7.4-amd64 "pkg_add gmake curl bzip2" gmake x86_64
-[ -f "${OUTDIR}/opam-$TAG-x86_64-freebsd" ] || qemu_build 9998 FreeBSD-13.2-RELEASE-amd64 "pkg install -y gmake curl bzip2" gmake x86_64
+[ -f "${OUTDIR}/opam-$TAG-x86_64-freebsd" ] || qemu_build 9998 FreeBSD-13.2-RELEASE-amd64 "env IGNORE_OSVERSION=yes pkg install -y gmake curl bzip2" gmake x86_64
 [ -f "${OUTDIR}/opam-$TAG-x86_64-windows" ] || windows_build 9997 Windows-10-x86_64