From 410c1b6cbd15aa84c64beee442e6a9d0bfbfc1f7 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Sun, 31 Mar 2024 21:31:34 -0400
Subject: [PATCH] stop support & testing of nearly 7 year old vs2017

---
 sys/windows/Install.windows |  2 +-
 sys/windows/Makefile.nmake  | 25 ++++++++-----------------
 sys/windows/build-vs.txt    |  2 +-
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/sys/windows/Install.windows b/sys/windows/Install.windows
index 78fa0bcc3..3b677e464 100644
--- a/sys/windows/Install.windows
+++ b/sys/windows/Install.windows
@@ -2,7 +2,7 @@ Copyright (c) NetHack Development Team 1990-2024
 NetHack may be freely redistributed.  See license for details.
 ==============================================================
   Instructions for compiling NetHack 3.7 on a Windows system
-                (Windows 8.x/10/11 or later only)
+      (only tested on Windows 10/11 or later)
 ==============================================================
 Last revision: $NHDT-Date: 1594155895 2020/07/07 21:04:55 $
 
diff --git a/sys/windows/Makefile.nmake b/sys/windows/Makefile.nmake
index 0f0b5f9b5..73cafa878 100644
--- a/sys/windows/Makefile.nmake
+++ b/sys/windows/Makefile.nmake
@@ -8,9 +8,8 @@
 #       MS Visual Studio Visual C++ compiler
 #
 #       Visual Studio Compilers Tested:
-#            - Microsoft Visual Studio 2017 Community Edition v 15.9.60
 #            - Microsoft Visual Studio 2019 Community Edition v 16.11.34
-#            - Microsoft Visual Studio 2022 Community Edition v 17.9.4
+#            - Microsoft Visual Studio 2022 Community Edition v 17.9.5
 #
 #==============================================================================
 #   This is used for building two distinct executables of NetHack:
@@ -985,18 +984,14 @@ rc=Rc.exe
 # is too old or untested.
 #
 # Recently tested versions:
-TESTEDVS2017 = 14.16.27051.0
 TESTEDVS2019 = 14.29.30154.0
 TESTEDVS2022 = 14.39.33523.0
 
-VS2017CUR = $(TESTEDVS2017:.=)
 VS2019CUR = $(TESTEDVS2019:.=)
 VS2022CUR = $(TESTEDVS2022:.=)
-VS2017UP1 = $(VS2017CUR) + 1
 VS2019UP1 = $(VS2019CUR) + 1
 VS2022UP1 = $(VS2022CUR) + 1
-VS20171ST = 1411000000
-VS20191ST = $(VS2017UP1)
+VS20191ST = 1419300000
 VS20221ST = $(VS2019UP1)
 
 #!MESSAGE $(MAKEFLAGS)
@@ -1010,17 +1005,9 @@ MAKEVERSION=$(MAKEVERSION: =)
 
 VSSPECIAL=
 VSNEWEST=2022
-!IF ($(MAKEVERSION) < 1000000000)
+!IF ($(MAKEVERSION) < 1411000000)
 VSVER=0000		#untested ancient version
-!ELSEIF ($(MAKEVERSION) > 1000000000) && ($(MAKEVERSION) < 1100000000)
-VSVER=2010
-!ELSEIF ($(MAKEVERSION) > 1100000000) && ($(MAKEVERSION) < 1200000000)
-VSVER=2012
-!ELSEIF ($(MAKEVERSION) > 1200000000) && ($(MAKEVERSION) < 1400000000)
-VSVER=2013
-!ELSEIF ($(MAKEVERSION) > 1400000000) && ($(MAKEVERSION) < 1411000000)
-VSVER=2015
-!ELSEIF ($(MAKEVERSION) > $(VS20171ST)) && ($(MAKEVERSION) < $(VS2017UP1))
+!ELSEIF ($(MAKEVERSION) < $(VS20191ST))
 VSVER=2017
 !ELSEIF ($(MAKEVERSION) > $(VS20191ST)) && ($(MAKEVERSION) < $(VS2019UP1))
 VSVER=2019
@@ -1032,9 +1019,13 @@ VSVER=2999              #untested future version
 
 !IF ($(VSVER) >= 2012)
 !IF ($(VSVER) <= $(VSNEWEST))
+!IF ($(VSVER) == 2017)
+!MESSAGE Autodetected Visual Studio $(VSVER) which we stopped testing with in March 2024
+!ELSE
 !MESSAGE Autodetected Visual Studio $(VSVER) $(VSSPECIAL)
 !ENDIF
 !ENDIF
+!ENDIF
 !IF ($(VSVER) == 2999)
 !MESSAGE The NMAKE version of this Visual Studio $(_NMAKE_VER) is newer than the
 !MESSAGE most recent at the time this Makefile was crafted (Visual Studio $(VSNEWEST)).
diff --git a/sys/windows/build-vs.txt b/sys/windows/build-vs.txt
index bd87cfc6a..a144470df 100644
--- a/sys/windows/build-vs.txt
+++ b/sys/windows/build-vs.txt
@@ -54,7 +54,7 @@ versions:
 
 
 /-----------------------------------------------------------\
-| Building And Running Using Visual Studio 2017, 2019, 2022  |
+| Building And Running Using Visual Studio 2019, 2022       |
 \-----------------------------------------------------------/
 
 When using Visual Studio Community Edition, load the provided solution