From 4c95ce048327d465382f265303555ebf32e5dcd0 Mon Sep 17 00:00:00 2001
From: Michael Paquier <michael@paquier.xyz>
Date: Fri, 21 Feb 2020 12:05:36 +0900
Subject: [PATCH] Doc: Fix instructions to control build environment with MSVC
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The documentation included some outdated instructions to change the
architecture, build type or target OS of a build done with MSVC.  This
commit updates the documentation to include the modern options
available, down to Visual Studio 2013.

Reported-by: Kyotaro Horiguchi
Author: Juan José Santamaría Flecha
Discussion: https://postgr.es/m/CAC+AXB0J7tAqW_2F1fCE4Dh2=Ccz96TcLpsGXOCvka7VvWG9Qw@mail.gmail.com
Backpatch-through: 12
---
 doc/src/sgml/install-windows.sgml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/doc/src/sgml/install-windows.sgml b/doc/src/sgml/install-windows.sgml
index 08556b6ebe..12b9843b2f 100644
--- a/doc/src/sgml/install-windows.sgml
+++ b/doc/src/sgml/install-windows.sgml
@@ -110,14 +110,19 @@
   <application>Visual Studio Command Prompt</application>.
   If you wish to build a 64-bit version, you must use the 64-bit version of
   the command, and vice versa.
-  In the <productname>Microsoft Windows SDK</productname>, start the
-  <application>CMD shell</application> listed under the SDK on the Start Menu.
-  In recent SDK versions you can change the targeted CPU architecture, build
-  type, and target OS by using the <command>setenv</command> command, e.g.
-  <command>setenv /x86 /release /xp</command> to target Windows XP or later
-  with a 32-bit release build. See <command>/?</command> for other options to
-  <command>setenv</command>.  All commands should be run from the
-  <filename>src\tools\msvc</filename> directory.
+  Starting with <productname>Visual Studio 2017</productname> this can be
+  done from the command line using <command>VsDevCmd.bat</command>, see
+  <command>-help</command> for the available options and their default values.
+  <command>vsvars32.bat</command> is available in
+  <productname>Visual Studio 2015</productname> and earlier versions for the
+  same purpose.
+  From the <application>Visual Studio Command Prompt</application>, you can
+  change the targeted CPU architecture, build type, and target OS by using the
+  <command>vcvarsall.bat</command> command, e.g.
+  <command>vcvarsall.bat x64 10.0.10240.0</command> to target Windows 10
+  with a 64-bit release build. See <command>-help</command> for the other
+  options of <command>vcvarsall.bat</command>. All commands should be run from
+  the <filename>src\tools\msvc</filename> directory.
  </para>
 
  <para>