Fix misleading warnings in msvc setup scripts (HaxeFoundation#1035)

tobil4sk · web-flow · commit 3c779109de54 · 2023-03-27T08:47:43.000+02:00
diff --git a/toolchain/msvc-setup.bat b/toolchain/msvc-setup.bat
@@ -16,7 +16,7 @@ setlocal enabledelayedexpansion
 		@echo HXCPP_VARS
 		@set
 	) else (
-		echo Warning: Could not find Visual Studio 2017 VsDevCmd
+		echo Warning: Could not find Visual Studio VsDevCmd
 	)
 ) else if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" (
 	@call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" -arch=x86 -app_platform=Desktop -no_logo
diff --git a/toolchain/msvc-winrt-setup.bat b/toolchain/msvc-winrt-setup.bat
@@ -10,7 +10,7 @@ setlocal enabledelayedexpansion
 		@echo HXCPP_VARS
 		@set
 	) else (
-		echo Warning: Could not find Visual Studio 2017 VsDevCmd
+		echo Warning: Could not find Visual Studio VsDevCmd
 	)
 ) else if exist "%VS140COMNTOOLS%\vsvars32.bat" (
 	@call "%VS140COMNTOOLS%\vsvars32.bat"
@@ -21,5 +21,5 @@ setlocal enabledelayedexpansion
 	@echo HXCPP_VARS
 	@set
 ) else (
-	echo Warning: Could not find x64 environment variables for Visual Studio 2015 or 2017 compiler
+	echo Warning: Could not find x64 environment variables for Visual Studio compiler
 )
diff --git a/toolchain/msvc-winrt64-setup.bat b/toolchain/msvc-winrt64-setup.bat
@@ -11,7 +11,7 @@ setlocal enabledelayedexpansion
 	        @set
 	        @echo HXCPP_HACK_PDBSRV=1
 	) else (
-		echo Warning: Could not find Visual Studio 2017 VsDevCmd
+		echo Warning: Could not find Visual Studio VsDevCmd
 	)
 ) else if exist "%VS140COMNTOOLS%\..\..\VC\bin\x86_amd64\vcvarsx86_amd64.bat" (
 	@call "%VS140COMNTOOLS%\..\..\VC\bin\x86_amd64\vcvarsx86_amd64.bat"
@@ -23,5 +23,5 @@ setlocal enabledelayedexpansion
 	@set
 	@echo HXCPP_HACK_PDBSRV=1
 ) else (
-	echo Warning: Could not find x64 environment variables for Visual Studio 2015 or 2017 compiler
+	echo Warning: Could not find x64 environment variables for Visual Studio compiler
 )
diff --git a/toolchain/msvc64-setup.bat b/toolchain/msvc64-setup.bat
@@ -17,7 +17,7 @@ setlocal enabledelayedexpansion
 		@echo HXCPP_VARS
 		@set
 	) else (
-		echo Warning: Could not find Visual Studio 2017 VsDevCmd
+		echo Warning: Could not find Visual Studio VsDevCmd
 	)
 ) else if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" (
 	@call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" -arch=amd64 -app_platform=Desktop -no_logo

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ setlocal enabledelayedexpansion`
`16`	`16`	`@echo HXCPP_VARS`
`17`	`17`	`@set`
`18`	`18`	`) else (`
`19`		`- echo Warning: Could not find Visual Studio 2017 VsDevCmd`
	`19`	`+ echo Warning: Could not find Visual Studio VsDevCmd`
`20`	`20`	`)`
`21`	`21`	`) else if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" (`
`22`	`22`	`@call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" -arch=x86 -app_platform=Desktop -no_logo`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ setlocal enabledelayedexpansion`
`17`	`17`	`@echo HXCPP_VARS`
`18`	`18`	`@set`
`19`	`19`	`) else (`
`20`		`- echo Warning: Could not find Visual Studio 2017 VsDevCmd`
	`20`	`+ echo Warning: Could not find Visual Studio VsDevCmd`
`21`	`21`	`)`
`22`	`22`	`) else if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" (`
`23`	`23`	`@call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" -arch=amd64 -app_platform=Desktop -no_logo`