romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 19:03:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

projects: Update VC version names for VS2017, VS2022

Browse source 
- Rename VC15 -> VC14.10, VC17 -> VC14.30.

The projects directory that holds the pre-generated Visual Studio
project files uses VC<ver> to indicate the MSVC version. At some point
support for Visual Studio 2017 (Visual Studio version 15 which uses MSVC
14.10) was added as VC15. Visual Studio 2022 (Visual Studio version 17
which uses MSVC 14.30) project files were recently added and followed
that same format using VC17.

There is no such MSVC version (yet) as VC15 or VC17.

For VS 2017 for example, the name we use is correct as either VS17,
VS2017, VC14.10. I opted for the latter since we use VC for earlier
versions (eg VC10, VC12, etc).

Ref: https://github.com/curl/curl/pull/8438#issuecomment-1037070192

Closes https://github.com/curl/curl/pull/8447
This commit is contained in:
Jay Satiro 2022-02-13 16:58:04 -05:00
parent 87da3e845b
commit f7376547bf
24 changed files with 512 additions and 499 deletions
Download patch file Download diff file Expand all files Collapse all files

48
projects/generate.bat
View file

@ -52,10 +52,10 @@ rem ***************************************************************************
set VERSION=VC12
) else if /i "%~1" == "vc14" (
set VERSION=VC14
) else if /i "%~1" == "vc15" (
set VERSION=VC15
) else if /i "%~1" == "vc17" (
set VERSION=VC17
) else if /i "%~1" == "vc14.10" (
set VERSION=VC14.10
) else if /i "%~1" == "vc14.30" (
set VERSION=VC14.30
) else if /i "%~1" == "-clean" (
set MODE=CLEAN
) else if /i "%~1" == "-?" (
@ -85,8 +85,8 @@ rem ***************************************************************************
if "%VERSION%" == "VC11" goto vc11
if "%VERSION%" == "VC12" goto vc12
if "%VERSION%" == "VC14" goto vc14
if "%VERSION%" == "VC15" goto vc15
if "%VERSION%" == "VC17" goto vc17
if "%VERSION%" == "VC14.10" goto vc14.10
if "%VERSION%" == "VC14.30" goto vc14.30
:vc10
echo.
@ -148,39 +148,39 @@ rem ***************************************************************************
if not "%VERSION%" == "ALL" goto success
:vc15
:vc14.10
echo.
if "%MODE%" == "GENERATE" (
echo Generating VC15 project files
call :generate vcxproj Windows\VC15\src\curl.tmpl Windows\VC15\src\curl.vcxproj
call :generate vcxproj Windows\VC15\lib\libcurl.tmpl Windows\VC15\lib\libcurl.vcxproj
echo Generating VC14.10 project files
call :generate vcxproj Windows\VC14.10\src\curl.tmpl Windows\VC14.10\src\curl.vcxproj
call :generate vcxproj Windows\VC14.10\lib\libcurl.tmpl Windows\VC14.10\lib\libcurl.vcxproj
) else (
echo Removing VC15 project files
call :clean Windows\VC15\src\curl.vcxproj
call :clean Windows\VC15\lib\libcurl.vcxproj
echo Removing VC14.10 project files
call :clean Windows\VC14.10\src\curl.vcxproj
call :clean Windows\VC14.10\lib\libcurl.vcxproj
)
if not "%VERSION%" == "ALL" goto success
:vc17
:vc14.30
echo.
if "%MODE%" == "GENERATE" (
echo Generating VC17 project files
call :generate vcxproj Windows\VC17\src\curl.tmpl Windows\VC17\src\curl.vcxproj
call :generate vcxproj Windows\VC17\lib\libcurl.tmpl Windows\VC17\lib\libcurl.vcxproj
echo Generating VC14.30 project files
call :generate vcxproj Windows\VC14.30\src\curl.tmpl Windows\VC14.30\src\curl.vcxproj
call :generate vcxproj Windows\VC14.30\lib\libcurl.tmpl Windows\VC14.30\lib\libcurl.vcxproj
) else (
echo Removing VC17 project files
call :clean Windows\VC17\src\curl.vcxproj
call :clean Windows\VC17\lib\libcurl.vcxproj
echo Removing VC14.30 project files
call :clean Windows\VC14.30\src\curl.vcxproj
call :clean Windows\VC14.30\lib\libcurl.vcxproj
)
goto success
rem Main generate function.
rem
rem %1 - Project Type (vcxproj for VC10, VC11, VC12, VC14, VC15 and VC17)
rem %1 - Project Type (vcxproj for VC10, VC11, VC12, VC14, VC14.10 and VC14.30)
rem %2 - Input template file
rem %3 - Output project file
rem
@ -258,7 +258,7 @@ rem
rem Generates a single file xml element.
rem
rem %1 - Project Type (vcxproj for VC10, VC11, VC12, VC14, VC15 and VC17)
rem %1 - Project Type (vcxproj for VC10, VC11, VC12, VC14, VC14.10 and VC14.30)
rem %2 - Directory (src, lib, lib\vauth, lib\vquic, lib\vssh, lib\vtls)
rem %3 - Source filename
rem %4 - Output project file
@ -353,8 +353,8 @@ rem
echo vc11 - Use Visual Studio 2012
echo vc12 - Use Visual Studio 2013
echo vc14 - Use Visual Studio 2015
echo vc15 - Use Visual Studio 2017
echo vc17 - Use Visual Studio 2022
echo vc14.10 - Use Visual Studio 2017
echo vc14.30 - Use Visual Studio 2022
echo.
echo -clean - Removes the project files
goto error