From 71445a04334368ee9abcae304789630d935d9a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Tue, 19 Jun 2018 16:41:11 +0200 Subject: OTP-21.0 --- early-plugins.mk | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'early-plugins.mk') diff --git a/early-plugins.mk b/early-plugins.mk index ad2da62..6ffa25e 100644 --- a/early-plugins.mk +++ b/early-plugins.mk @@ -26,7 +26,7 @@ OTP-18 := OTP-18.0.3 OTP-18.1.5 OTP-18.2.4 OTP-18.3.4.9 OTP-19 := OTP-19.0.7 OTP-19.1.6 OTP-19.2.3 OTP-19.3.6.9 OTP-20 := OTP-20.0.5 OTP-20.1.7 OTP-20.2.4 OTP-20.3.8 -OTP-21 := OTP-21.0-rc2 +OTP-21 := OTP-21.0 OTP-18+ := $(OTP-18) $(OTP-19) $(OTP-20) $(OTP-21) OTP-19+ := $(OTP-19) $(OTP-20) $(OTP-21) @@ -45,7 +45,7 @@ OTP-LATEST := $(lastword $(foreach rel,$(OTP-18+),$(if $(findstring -rc,$(rel)), OTP-18-DROPPED := OTP-18.3.4 OTP-18.3.4.6 OTP-18.3.4.7 OTP-18.3.4.8 OTP-19-DROPPED := OTP-19.3.6 OTP-19.3.6.3 OTP-19.3.6.4 OTP-19.3.6.5 OTP-19.3.6.6 OTP-19.3.6.7 OTP-19.3.6.8 OTP-20-DROPPED := OTP-20.1.5 OTP-20.1.6 OTP-20.2 OTP-20.2.1 OTP-20.2.2 OTP-20.2.3 OTP-20.3 OTP-20.3.2 OTP-20.3.3 OTP-20.3.4 OTP-20.3.5 OTP-20.3.6 OTP-20.3.7 -OTP-21-DROPPED := OTP-21.0-rc1 +OTP-21-DROPPED := OTP-21.0-rc1 OTP-21.0-rc2 OTP-DROPPED := $(OTP-18-DROPPED) $(OTP-19-DROPPED) $(OTP-20-DROPPED) $(OTP-21-DROPPED) @@ -88,10 +88,12 @@ ifeq ($(PLATFORM),msys2) WINDOWS-OTP-18 := 18.0 18.1 18.2.1 18.3 WINDOWS-OTP-19 := 19.0 19.1 19.2 19.3 WINDOWS-OTP-20 := 20.0 20.1 20.2 20.3 +WINDOWS-OTP-21 := 21.0 -WINDOWS-OTP-18+ := $(WINDOWS-OTP-18) $(WINDOWS-OTP-19) $(WINDOWS-OTP-20) -WINDOWS-OTP-19+ := $(WINDOWS-OTP-19) $(WINDOWS-OTP-20) -WINDOWS-OTP-20+ := $(WINDOWS-OTP-20) +WINDOWS-OTP-18+ := $(WINDOWS-OTP-18) $(WINDOWS-OTP-19) $(WINDOWS-OTP-20) $(WINDOWS-OTP-21) +WINDOWS-OTP-19+ := $(WINDOWS-OTP-19) $(WINDOWS-OTP-20) $(WINDOWS-OTP-21) +WINDOWS-OTP-20+ := $(WINDOWS-OTP-20) $(WINDOWS-OTP-21) +WINDOWS-OTP-21+ := $(WINDOWS-OTP-21) WINDOWS-OTP-LATEST := $(lastword $(WINDOWS-OTP-18+)) @@ -112,6 +114,8 @@ WINDOWS-OTP-20.1-INSTALL-DIR := $(call msys2_path,$(PROGRAMFILES)/erl9.1/bin) WINDOWS-OTP-20.2-INSTALL-DIR := $(call msys2_path,$(PROGRAMFILES)/erl9.2/bin) WINDOWS-OTP-20.3-INSTALL-DIR := $(call msys2_path,$(PROGRAMFILES)/erl9.3/bin) +WINDOWS-OTP-21.0-INSTALL-DIR := $(call msys2_path,$(PROGRAMFILES)/erl10.0/bin) + # We have to duplicate this for it to work as # it is not yet defined when we define this. ci_windows_verbose_0 = @echo " CI " $(1); -- cgit v1.2.3