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

diff --git a/doc/src/sgml/install-windows.sgml b/doc/src/sgml/install-windows.sgml
index 318c508276088850a7f7474543f981a7ed8489b8..02fb9f94251616f2fa41150a9b5507ffb37a3e95 100644 (file)
--- a/doc/src/sgml/install-windows.sgml
+++ b/doc/src/sgml/install-windows.sgml
@@ -19,9 +19,9 @@
  <para>
   There are several different ways of building PostgreSQL on
   <productname>Windows</productname>. The simplest way to build with
-  Microsoft tools is to install <productname>Visual Studio 2019</productname>
+  Microsoft tools is to install <productname>Visual Studio 2022</productname>
   and use the included compiler. It is also possible to build with the full
-  <productname>Microsoft Visual C++ 2005 to 2019</productname>.
+  <productname>Microsoft Visual C++ 2005 to 2022</productname>.
   In some cases that requires the installation of the
   <productname>Windows SDK</productname> in addition to the compiler.
  </para>
@@ -69,7 +69,7 @@
   <productname>Microsoft Windows SDK</productname>. If you do not already have a
   <productname>Visual Studio</productname> environment set up, the easiest
   ways are to use the compilers from
-  <productname>Visual Studio 2019</productname> or those in the
+  <productname>Visual Studio 2022</productname> or those in the
   <productname>Windows SDK 10</productname>, which are both free downloads
   from Microsoft.
  </para>
@@ -78,7 +78,7 @@
   Both 32-bit and 64-bit builds are possible with the Microsoft Compiler suite.
   32-bit PostgreSQL builds are possible with
   <productname>Visual Studio 2005</productname> to
-  <productname>Visual Studio 2019</productname>,
+  <productname>Visual Studio 2022</productname>,
   as well as standalone Windows SDK releases 6.0 to 10.
   64-bit PostgreSQL builds are supported with
   <productname>Microsoft Windows SDK</productname> version 6.0a to 10 or
@@ -90,7 +90,7 @@
   <productname>Visual Studio 2015</productname> is supported down to
   <productname>Windows Vista</productname> and <productname>Windows Server 2008</productname>.
   Building with <productname>Visual Studio 2017</productname> to
-  <productname>Visual Studio 2019</productname> is supported
+  <productname>Visual Studio 2022</productname> is supported
    down to <productname>Windows 7 SP1</productname> and <productname>Windows Server 2008 R2 SP1</productname>.
  </para>
 

diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm
index 7a871828dfb07c8d5fb93675687ca8211245b30e..56202738b996fcf2ccf938166fb7583868f50d50 100644 (file)
--- a/src/tools/msvc/MSBuildProject.pm
+++ b/src/tools/msvc/MSBuildProject.pm
@@ -573,4 +573,29 @@ sub new
    return $self;
 }
 
+package VC2022Project;
+
+#
+# Package that encapsulates a Visual C++ 2022 project file
+#
+
+use strict;
+use warnings;
+use base qw(VC2012Project);
+
+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 c6db875730cf2ec5b26499ee3e6fa08b77dfb898..e8e14bddeac15c9fc80481184e554ae3e60ac54f 100644 (file)
--- 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 2005 - 2019. This builds the whole backend, not just
+Microsoft Visual Studio 2005 - 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.
 
@@ -92,13 +92,13 @@ 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 a VS2005Solution,
-a VS2008Solution, a VS2010Solution or a VS2012Solution or a VS2013Solution,
-or a VS2015Solution or a VS2017Solution or a VS2019Solution, all in
-Solution.pm, depending on the user's build environment) and adding objects
+a VS2008Solution, a VS2010Solution, a VS2012Solution, a VS2013Solution,
+a VS2015Solution, a VS2017Solution, a VS2019Solution or a VS2022Solution, all
+in Solution.pm, depending on the user's build environment) and adding objects
 implementing the corresponding Project interface (VC2005Project or
 VC2008Project from VCBuildProject.pm or VC2010Project or VC2012Project or
-VC2013Project or VC2015Project or VC2017Project or VC2019Project from
-MSBuildProject.pm) to it.
+VC2013Project or VC2015Project or VC2017Project or 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 or vcbuild)

diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index d6bd0c7f1a6edd8d1449e40b0cd87170497c26fd..60293c7a88f586f871531de6611a870e6ce19fa7 100644 (file)
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -1086,6 +1086,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 fb774011ffd37fb6a4af97226745fe82454b0bb7..4e51aec55795369cf88a642ebdec1ec2416d98ae 100644 (file)
--- a/src/tools/msvc/VSObjectFactory.pm
+++ b/src/tools/msvc/VSObjectFactory.pm
@@ -75,6 +75,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
@@ -135,6 +145,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
@@ -166,13 +186,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 < 6)
    {