diff options
author | Michael Paquier <michael@paquier.xyz> | 2021-11-24 13:03:55 +0900 |
---|---|---|
committer | Michael Paquier <michael@paquier.xyz> | 2021-11-24 13:03:55 +0900 |
commit | 0e681fa458750b08a5c7885820320fb85cd9ddf1 (patch) | |
tree | 4d16f66af0548203542ce12d6cc7481f49045d95 /src | |
parent | 7933bc0d13616844ed66271942eac12c3a7f0488 (diff) | |
download | postgresql-0e681fa458750b08a5c7885820320fb85cd9ddf1.tar.gz postgresql-0e681fa458750b08a5c7885820320fb85cd9ddf1.zip |
Add support for Visual Studio 2022 in build scripts
Documentation and any code paths related to VS are updated to keep the
whole consistent. Similarly to 2017 and 2019, the version of VS and the
version of nmake that we use to determine which code paths to use for
the build are still inconsistent in their own way.
Backpatch down to 10, so as buildfarm members are able to use this new
version of Visual Studio on all the stable branches supported.
Author: Hans Buschmann
Discussion: https://postgr.es/m/1633101364685.39218@nidsa.net
Backpatch-through: 10
Diffstat (limited to 'src')
-rw-r--r-- | src/tools/msvc/MSBuildProject.pm | 25 | ||||
-rw-r--r-- | src/tools/msvc/README | 14 | ||||
-rw-r--r-- | src/tools/msvc/Solution.pm | 28 | ||||
-rw-r--r-- | src/tools/msvc/VSObjectFactory.pm | 28 |
4 files changed, 84 insertions, 11 deletions
diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm index ebe6530ba58..33595cce0fc 100644 --- a/src/tools/msvc/MSBuildProject.pm +++ b/src/tools/msvc/MSBuildProject.pm @@ -508,4 +508,29 @@ sub new return $self; } +package VC2022Project; + +# +# Package that encapsulates a Visual C++ 2022 project file +# + +use strict; +use warnings; +use base qw(MSBuildProject); + +no warnings qw(redefine); ## no critic + +sub new +{ + my $classname = shift; + my $self = $classname->SUPER::_new(@_); + bless($self, $classname); + + $self->{vcver} = '17.00'; + $self->{PlatformToolset} = 'v143'; + $self->{ToolsVersion} = '17.0'; + + return $self; +} + 1; diff --git a/src/tools/msvc/README b/src/tools/msvc/README index f1547594fd6..473d6f425b2 100644 --- a/src/tools/msvc/README +++ b/src/tools/msvc/README @@ -4,7 +4,7 @@ MSVC build ========== This directory contains the tools required to build PostgreSQL using -Microsoft Visual Studio 2013 - 2019. This builds the whole backend, not just +Microsoft Visual Studio 2013 - 2022. This builds the whole backend, not just the libpq frontend library. For more information, see the documentation chapter "Installation on Windows" and the description below. @@ -89,11 +89,11 @@ These configuration arguments are passed over to Mkvcbuild::mkvcbuild (Mkvcbuild.pm) which creates the Visual Studio project and solution files. It does this by using VSObjectFactory::CreateSolution to create an object implementing the Solution interface (this could be either VS2013Solution, -VS2015Solution, VS2017Solution or VS2019Solution, all in Solution.pm, -depending on the user's build environment) and adding objects implementing -the corresponding Project interface (VC2013Project, VC2015Project, -VC2017Project or VC2019Project from MSBuildProject.pm) to it. -When Solution::Save is called, the implementations of Solution and Project -save their content in the appropriate format. +VS2015Solution, VS2017Solution, VS2019Solution or VS2022Solution, all in +Solution.pm, depending on the user's build environment) and adding objects +implementing the corresponding Project interface (VC2013Project, +VC2015Project, VC2017Project, VC2019Project or VC2022Project from +MSBuildProject.pm) to it. When Solution::Save is called, the implementations +of Solution and Project save their content in the appropriate format. The final step of starting the appropriate build program (msbuild) is performed in build.pl again. diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index eaec9f14bc1..138b630b999 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -1317,6 +1317,34 @@ sub new return $self; } +package VS2022Solution; + +# +# Package that encapsulates a Visual Studio 2022 solution file +# + +use Carp; +use strict; +use warnings; +use base qw(Solution); + +no warnings qw(redefine); ## no critic + +sub new +{ + my $classname = shift; + my $self = $classname->SUPER::_new(@_); + bless($self, $classname); + + $self->{solutionFileVersion} = '12.00'; + $self->{vcver} = '17.00'; + $self->{visualStudioName} = 'Visual Studio 2022'; + $self->{VisualStudioVersion} = '17.0.31903.59'; + $self->{MinimumVisualStudioVersion} = '10.0.40219.1'; + + return $self; +} + sub GetAdditionalHeaders { my ($self, $f) = @_; diff --git a/src/tools/msvc/VSObjectFactory.pm b/src/tools/msvc/VSObjectFactory.pm index 61e83f52a09..a865604a5a1 100644 --- a/src/tools/msvc/VSObjectFactory.pm +++ b/src/tools/msvc/VSObjectFactory.pm @@ -61,6 +61,16 @@ sub CreateSolution { return new VS2019Solution(@_); } + + # The version of nmake bundled in Visual Studio 2022 is greater + # than 14.30 and less than 14.40. And the version number is + # actually 17.00. + elsif ( + ($visualStudioVersion ge '14.30' && $visualStudioVersion lt '14.40') + || $visualStudioVersion eq '17.00') + { + return new VS2022Solution(@_); + } else { croak @@ -105,6 +115,16 @@ sub CreateProject { return new VC2019Project(@_); } + + # The version of nmake bundled in Visual Studio 2022 is greater + # than 14.30 and less than 14.40. And the version number is + # actually 17.00. + elsif ( + ($visualStudioVersion ge '14.30' && $visualStudioVersion lt '14.40') + || $visualStudioVersion eq '17.00') + { + return new VC2022Project(@_); + } else { croak @@ -134,7 +154,7 @@ sub DetermineVisualStudioVersion else { # fake version - return '16.00'; + return '17.00'; } } @@ -143,13 +163,13 @@ sub _GetVisualStudioVersion my ($major, $minor) = @_; # The major visual studio that is supported has nmake - # version <= 14.30, so stick with it as the latest version + # version <= 14.40, so stick with it as the latest version # if bumping on something even newer. - if ($major >= 14 && $minor >= 30) + if ($major >= 14 && $minor >= 40) { carp "The determined version of Visual Studio is newer than the latest supported version. Returning the latest supported version instead."; - return '14.20'; + return '14.30'; } elsif ($major < 12) { |