5 files changed, 33 insertions, 83 deletions
diff --git a/dev/build/plugin-versions/bignums.sh b/dev/build/plugin-versions/bignums.sh
deleted file mode 100755
index 8a4ddf5fc..000000000
--- a/dev/build/plugin-versions/bignums.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-case "$1" in
-    git-master|/cygdrive*)
-        # First get the SHA of master/HEAD and then download a zip of exactly this state
-        BIGNUMS_SHA=$(git ls-remote 'https://github.com/coq/bignums' refs/heads/master | cut -f 1)
-
-        echo https://github.com/coq/bignums/archive "$BIGNUMS_SHA" zip 1 "bignums-$BIGNUMS_SHA"
-        ;;
-    *)
-        echo https://github.com/coq/bignums/archive V8.8.0 zip 1 bignums-V8.8+beta1
-        ;;
-esac
diff --git a/dev/build/plugin-versions/equations.sh b/dev/build/plugin-versions/equations.sh
deleted file mode 100755
index 9fc2e237a..000000000
--- a/dev/build/plugin-versions/equations.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-case "$1" in
-    git-master|/cygdrive*)
-        # First get the SHA of master/HEAD and then download a zip of exactly this state
-        EQUATIONS_SHA=$(git ls-remote 'https://github.com/mattam82/Coq-Equations' refs/heads/master | cut -f 1)
-
-        echo https://github.com/mattam82/Coq-Equations/archive "$EQUATIONS_SHA" zip 1 "equations-$EQUATIONS_SHA"
-        ;;
-    *)
-        echo https://github.com/mattam82/Coq-Equations/archive v1.1-8.8 zip 1 equations-v1.1-8.8
-        ;;
-esac
diff --git a/dev/build/plugin-versions/ltac2.sh b/dev/build/plugin-versions/ltac2.sh
deleted file mode 100755
index feee3c92c..000000000
--- a/dev/build/plugin-versions/ltac2.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-case "$1" in
-    git-master|/cygdrive*)
-        # First get the SHA of master/HEAD and then download a zip of exactly this state
-        LTAC2_SHA=$(git ls-remote 'https://github.com/ppedrot/ltac2' refs/heads/master | cut -f 1)
-
-        echo https://github.com/ppedrot/ltac2/archive "$LTAC2_SHA" zip 1 "ltac2-$LTAC2_SHA"
-        ;;
-    *)
-        echo https://github.com/ppedrot/ltac2/archive v8.8 zip 1 ltac2-v8.8
-        ;;
-esac
diff --git a/dev/build/plugin-versions/readme.md b/dev/build/plugin-versions/readme.md
deleted file mode 100644
index 39277d09b..000000000
--- a/dev/build/plugin-versions/readme.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# Controlling the versions of plugins
-
-The shell scripts in this folder each return (to stdout) the source URL and some extra
-information for a specific plugin with a version appropriate for this version of Coq.
-
-This mechanism is only intended for plugins and libraries which need a tight coupling to the version of Coq.
-
-The shell scripts get the Coq version as first argument.
-Examples for possible values are:
-
-* git-v8.8.1
-* git-master
-* 8.5pl3
-* 8.8.1
-* /cygdrive/<some-folder>
-
-Scripts can simply echo an URL, but more advanced processing is possible.
-
-The output format is the same as the command line to the function build_prep in makecoq_mingw.sh. Here is an example:
-
-```
-#!/bin/sh
-echo 'https://github.com/ppedrot/ltac2/archive' 'v8.8' 'zip' '1' 'ltac2-v8.8'
-```
-
-The arguments are:
-* URL path without file name
-* file name
-* file extension
-* number of path levels to strip from archive (optional, default is 1)
-* module name, in case the file name just gives a version but no module name
-
-## Handling master versions
-
-In case a master version is returned, the module name should contain the SHA code of the revision downloaded.
-Below is an example of how to achieve this (thanks to SkySkimmer):
-
-```
-BIGNUMS_SHA=$(git ls-remote 'https://github.com/coq/bignums' refs/heads/master | cut -f 1)
-
-echo https://github.com/coq/bignums/archive "$BIGNUMS_SHA" zip 1 "bignums-$BIGNUMS_SHA"
-```
diff --git a/dev/build/windows/makecoq_mingw.sh b/dev/build/windows/makecoq_mingw.sh
index 4fabf3161..9618f6b4e 100644
--- a/dev/build/windows/makecoq_mingw.sh
+++ b/dev/build/windows/makecoq_mingw.sh
@@ -1214,8 +1214,9 @@ function make_coq {
     # 2.) clean of test suites fails with "cannot run complexity tests (no bogomips found)"
     # make clean
 
-    # Copy plugin version files somewhere, where the plugin builds can find them
-    cp -r dev/build/plugin-versions /build/
+    # Copy these files somewhere the plugin builds can find them
+    cp dev/ci/ci-basic-overlay.sh /build/
+    cp -r dev/ci/user-overlays /build/
 
     build_post
   fi
@@ -1388,7 +1389,12 @@ function make_coq_installer {
 # Provides BigN, BigZ, BigQ that used to be part of Coq standard library
 
 function make_addon_bignums {
-  if build_prep $(/build/plugin-versions/bignums.sh "$COQ_VERSION"); then
+  bignums_SHA=$(git ls-remote "$bignums_CI_GITURL" "refs/heads/$bignums_CI_BRANCH" | cut -f 1)
+  if [[ "$bignums_SHA" == "" ]]; then
+      # $bignums_CI_BRANCH must have been a tag and not a branch
+      bignums_SHA="$bignums_CI_BRANCH"
+  fi
+  if build_prep "${bignums_CI_GITURL}/archive" "$bignums_SHA" zip 1 "bignums-$bignums_SHA"; then
     # To make command lines shorter :-(
     echo 'COQ_SRC_SUBDIRS:=$(filter-out plugins/%,$(COQ_SRC_SUBDIRS)) plugins/syntax' >> Makefile.coq.local
     log1 make all
@@ -1401,7 +1407,12 @@ function make_addon_bignums {
 # A new (experimental) tactic language
 
 function make_addon_ltac2 {
-  if build_prep $(/build/plugin-versions/ltac2.sh "$COQ_VERSION"); then
+  ltac2_SHA=$(git ls-remote "$ltac2_CI_GITURL" "refs/heads/$ltac2_CI_BRANCH" | cut -f 1)
+  if [[ "$ltac2_SHA" == "" ]]; then
+      # $ltac2_CI_BRANCH must have been a tag and not a branch
+      ltac2_SHA="$ltac2_CI_BRANCH"
+  fi
+  if build_prep "${ltac2_CI_GITURL}/archive" "$ltac2_SHA" zip 1 "ltac2-$ltac2_SHA"; then
     log1 make all
     log2 make install
     build_post
@@ -1412,7 +1423,12 @@ function make_addon_ltac2 {
 # A function definition plugin
 
 function make_addon_equations {
-  if build_prep $(/build/plugin-versions/equations.sh "$COQ_VERSION"); then
+  Equations_SHA=$(git ls-remote "$Equations_CI_GITURL" "refs/heads/$Equations_CI_BRANCH" | cut -f 1)
+  if [[ "$Equations_SHA" == "" ]]; then
+      # $Equations_CI_BRANCH must have been a tag and not a branch
+      Equations_SHA="$Equations_CI_BRANCH"
+  fi
+  if build_prep "${Equations_CI_GITURL}/archive" "$Equations_SHA" zip 1 "Equations-$Equations_SHA"; then
     # Note: PATH is autmatically saved/restored by build_prep / build_post
     PATH=$COQBIN:$PATH
     logn coq_makefile ${COQBIN}coq_makefile -f _CoqProject -o Makefile
@@ -1423,6 +1439,18 @@ function make_addon_equations {
 }
 
 function make_addons {
+  if [ -n "${GITLAB_CI}" ]; then
+    export CI_BRANCH="$CI_COMMIT_REF_NAME"
+    if [[ ${CI_BRANCH#pr-} =~ ^[0-9]*$ ]]
+    then
+      export CI_PULL_REQUEST="${CI_BRANCH#pr-}"
+    fi
+  fi
+  . /build/ci-basic-overlay.sh
+  for overlay in /build/user-overlays/*.sh; do
+    . "$overlay"
+  done
+
   for addon in $COQ_ADDONS; do
     "make_addon_$addon"
   done