Update $VSWHERE description. [skip appveyor]

Requested wordsmithing on the VSWHERE construction variable. Per request, dropped msvc.py from the github/win32 skip list. Signed-off-by: Mats Wichmann <[email protected]>
SCons · Jul 1, 2024 · f40aad1 · f40aad1
1 parent c70c47f
commit f40aad1
Show file tree

Hide file tree

Showing 6 changed files with 226 additions and 136 deletions.
diff --git a/SCons/Tool/msvc.xml b/SCons/Tool/msvc.xml
@@ -417,7 +417,7 @@ msvc &f-link-Tool; (e.g., &t-link-msvc;) or an msvc-dependent &f-link-Tool; (e.g
 the &cv-MSVC_VERSION; is resolved when the &consenv; is created.
 In this case, passing &cv-MSVC_VERSION; as an argument in the &f-link-Environment; call
 is the effective solution.
-Otherwise, &cv-MSVC_VERSION; must be set before the first msvc &f-link-Tool; or 
+Otherwise, &cv-MSVC_VERSION; must be set before the first msvc &f-link-Tool; or
 msvc-dependent &f-link-Tool; is loaded into the environment.
 See the manpage section "Construction Environments" for an example.
 </para>
@@ -607,7 +607,7 @@ Visual Studio </literallayout></entry>
     "Express" or "Express for Desktop" Visual Studio editions,
     which had feature limitations compared to the full editions.
     It is only necessary to specify the <literal>Exp</literal>
-    suffix to select the express edition when both express and 
+    suffix to select the express edition when both express and
     non-express editions of the same product are installed
     simulaneously. The <literal>Exp</literal> suffix is unnecessary,
     but accepted, when only the express edition is installed.
@@ -860,20 +860,28 @@ The burden is on the user to ensure the requisite UWP libraries are installed.
 <cvar name="VSWHERE">
 <summary>
 <para>
-Specify the location of <filename>vswhere.exe</filename>.
+Specify the location of <command>vswhere.exe</command>.
 </para>
 
 <para>
-    The <filename>vswhere.exe</filename> executable is distributed with Microsoft Visual Studio and Build
-    Tools since the 2017 edition, but is also available as a standalone installation.
-    It provides full information about installations of 2017 and later editions.
-    With the <option>-legacy</option> argument, <filename>vswhere.exe</filename> can detect installations of the 2010 through 2015
-    editions with limited data returned.
+    The <command>vswhere.exe</command> executable is distributed with
+    Microsoft Visual Studio and Build Tools since the 2017 edition,
+    but is also available as a standalone installation.
+    It allows queries to obtain detailed information about
+    installations of 2017 and later editions;
+    with the <option>-legacy</option> argument,
+    it can return limited information for
+    installations of the 2010 through 2015 editions.
+    &SCons; makes use of this information to help determine
+    the state of compiler support.
 </para>
 <para>
-    If &cv-VSWHERE; is set to a <filename>vswhere.exe</filename> location, &SCons; will use that location.
-    When &cv-VSWHERE; is undefined, &SCons; will look in the following locations and set &cv-VSWHERE; to the path
-    of the first <filename>vswhere.exe</filename> located:
+    You can set the &cv-VSWHERE; variable to the path to a specific
+    <command>vswhere.exe</command> binary,
+    and &SCons; will use that.
+    If undefined (the default), &SCons; will search for one,
+    looking in the following locations in order,
+    using the first found, and updating &cv-VSWHERE; with the location.
 </para>
 
 <itemizedlist>
@@ -885,31 +893,38 @@ Specify the location of <filename>vswhere.exe</filename>.
 <listitem><para><literal>%SCOOP%\shims</literal></para></listitem>
 </itemizedlist>
 
-<para>
-  Note that &cv-VSWHERE; must be set prior to the initial &MSVC; compiler discovery.
-  For example, &cv-VSWHERE; must be set at the same time or before the first msvc &f-link-Tool;
-  (e.g., &t-link-msvc;) or msvc-dependent &f-link-Tool; (e.g., &t-link-midl;) is initialized.
-</para>
 
-<para>
-  Either set it as follows:
-<programlisting>
+<note>
+  <para>
+    In order to take effect, &cv-VSWHERE; must be set before
+    the initial &MSVC; compiler discovery takes place.
+    Discovery happens, at the latest, during the first call to the
+    &f-link-Environment; function, unless a <parameter>tools</parameter>
+    list is specified which excludes the entire MSVC toolchain
+    (that is, does not include <literal>"defaults"</literal>
+    or any of the specific tools),
+    in which case it happens when one of the tools is invoked manually.
+    The following two examples illustrate this:
+  </para>
+
+  <programlisting>
+# VSWHERE set as Environment is created
 env = Environment(VSWHERE='c:/my/path/to/vswhere')
-</programlisting>
-
-Or, if your &consenv; is created specifying: (a) an empty tools list, or (b)
-a list of tools which omits all of default, msvc (e.g., &t-link-msvc;), and
-msvc-dependent tools (e.g., &t-link-midl;); and before &f-link-env-Tool;
-is called to initialize any of those tools:
 
-<programlisting>
-    env = Environment(tools=[])
-    env['VSWHERE'] = r'c:/my/vswhere/install/location/vswhere.exe'
-    env.Tool('msvc')
-    env.Tool('mslink')
-    env.Tool('msvs')
-    </programlisting>
-</para>
+# Initialization deferred with empty tools, triggered manually
+env = Environment(tools=[])
+env['VSWHERE'] = r'c:/my/vswhere/install/location/vswhere.exe'
+env.Tool('msvc')
+env.Tool('mslink')
+env.Tool('msvs')
+  </programlisting>
+
+  <para>
+    The tool modules that trigger detection are
+    &t-link-msvc;, &t-link-mslink;, &t-link-masm;, &t-link-midl;
+    and &t-link-msvs;.
+  </para>
+</note>
 
 </summary>
 </cvar>

diff --git a/doc/generated/builders.gen b/doc/generated/builders.gen
@@ -823,7 +823,7 @@ languages defined in <filename>LINGUAS</filename> file:
 
 <para>
 <emphasis>Example 4</emphasis>.
-Compile files for languages defined in <filename>LINGUAS</filename> file 
+Compile files for languages defined in <filename>LINGUAS</filename> file
 (another version):
 </para>
 <example_commands>
@@ -1650,7 +1650,7 @@ Initialize <filename>en.po</filename> and <filename>pl.po</filename> from
 </para>
 <example_commands>
   # ...
-  env.POInit(['en', 'pl']) # messages.pot --&gt; [en.po, pl.po] 
+  env.POInit(['en', 'pl']) # messages.pot --&gt; [en.po, pl.po]
 </example_commands>
 
 <para>
@@ -1660,7 +1660,7 @@ Initialize <filename>en.po</filename> and <filename>pl.po</filename> from
 </para>
 <example_commands>
   # ...
-  env.POInit(['en', 'pl'], ['foo']) # foo.pot --&gt; [en.po, pl.po] 
+  env.POInit(['en', 'pl'], ['foo']) # foo.pot --&gt; [en.po, pl.po]
 </example_commands>
 
 <para>
@@ -1671,7 +1671,7 @@ variable:
 </para>
 <example_commands>
   # ...
-  env.POInit(['en', 'pl'], POTDOMAIN='foo') # foo.pot --&gt; [en.po, pl.po] 
+  env.POInit(['en', 'pl'], POTDOMAIN='foo') # foo.pot --&gt; [en.po, pl.po]
 </example_commands>
 
 <para>
@@ -1756,7 +1756,7 @@ special alias (<literal>pot-update</literal> by default, see
 &cv-link-POTUPDATE_ALIAS;) so you can update/create them easily with
 <command>scons pot-update</command>. The file is not written until there is no
 real change in internationalized messages (or in comments that enter
-<literal>POT</literal> file). 
+<literal>POT</literal> file).
 </para>
 
 <para>
@@ -1779,7 +1779,7 @@ Let's create <filename>po/</filename> directory and place following
   env = Environment( tools = ['default', 'xgettext'] )
   env.POTUpdate(['foo'], ['../a.cpp', '../b.cpp'])
   env.POTUpdate(['bar'], ['../c.cpp', '../d.cpp'])
-</example_commands>      
+</example_commands>
 <para>
 Then invoke scons few times:
 </para>
@@ -1800,7 +1800,7 @@ case default target <filename>messages.pot</filename> will be used. The
 default target may also be overridden by setting &cv-link-POTDOMAIN; construction
 variable or providing it as an override to &b-POTUpdate; builder:
 </para>
-<example_commands>    
+<example_commands>
   # SConstruct script
   env = Environment( tools = ['default', 'xgettext'] )
   env['POTDOMAIN'] = "foo"
@@ -1813,21 +1813,21 @@ variable or providing it as an override to &b-POTUpdate; builder:
 The sources may be specified within separate file, for example
 <filename>POTFILES.in</filename>:
 </para>
-<example_commands>      
+<example_commands>
   # POTFILES.in in 'po/' subdirectory
   ../a.cpp
   ../b.cpp
   # end of file
-</example_commands>    
+</example_commands>
 <para>
 The name of the file (<filename>POTFILES.in</filename>) containing the list of
 sources is provided via &cv-link-XGETTEXTFROM;:
 </para>
-<example_commands>      
+<example_commands>
   # SConstruct file in 'po/' subdirectory
   env = Environment( tools = ['default', 'xgettext'] )
   env.POTUpdate(XGETTEXTFROM = 'POTFILES.in')
-</example_commands>    
+</example_commands>
 
 <para>
 <emphasis>Example 4.</emphasis>
@@ -1898,10 +1898,10 @@ message <literal>"Hello from ../a.cpp"</literal>. When you reverse order in
   # SConstruct file in '0/1/po/' subdirectory
   env = Environment( tools = ['default', 'xgettext'] )
   env.POTUpdate(XGETTEXTFROM = 'POTFILES.in', XGETTEXTPATH=['../../', '../'])
-</example_commands> 
+</example_commands>
 <para>
 then the <filename>messages.pot</filename> will contain
-<literal>msgid "Hello from ../../a.cpp"</literal> line and not 
+<literal>msgid "Hello from ../../a.cpp"</literal> line and not
 <literal>msgid "Hello from ../a.cpp"</literal>.
 </para>
 
@@ -1923,9 +1923,9 @@ does.
 <para>
 Target nodes defined through &b-POUpdate; are not built by default
 (they're <literal>Ignore</literal>d from <literal>'.'</literal> node). Instead,
-they are added automatically to special <literal>Alias</literal> 
+they are added automatically to special <literal>Alias</literal>
 (<literal>'po-update'</literal> by default). The alias name may be changed
-through the &cv-link-POUPDATE_ALIAS; construction variable.  You can easily 
+through the &cv-link-POUPDATE_ALIAS; construction variable.  You can easily
 update <literal>PO</literal> files in your project by <command>scons
 po-update</command>.
 </para>
@@ -1989,7 +1989,7 @@ from <filename>messages.pot</filename> template:
 </para>
 <example_commands>
   # produce 'en.po', 'pl.po' + files defined in 'LINGUAS':
-  env.POUpdate(['en', 'pl' ], LINGUAS_FILE = 1) 
+  env.POUpdate(['en', 'pl' ], LINGUAS_FILE = 1)
 </example_commands>
 
 <para>
@@ -2724,7 +2724,7 @@ a SCons script when invoking &b-Translate;
 # SConscript in 'po/' directory
 env = Environment( tools = ["default", "gettext"] )
 env['POAUTOINIT'] = 1
-env.Translate(['en','pl'], ['../a.cpp','../b.cpp']) 
+env.Translate(['en','pl'], ['../a.cpp','../b.cpp'])
 </example_commands>
 
 <para>
@@ -2735,7 +2735,7 @@ If you wish, you may also stick to conventional style known from
 </para>
 <example_commands>
 # LINGUAS
-en pl 
+en pl
 #end
 </example_commands>
 
@@ -2751,7 +2751,7 @@ b.cpp
 env = Environment( tools = ["default", "gettext"] )
 env['POAUTOINIT'] = 1
 env['XGETTEXTPATH'] = ['../']
-env.Translate(LINGUAS_FILE = 1, XGETTEXTFROM = 'POTFILES.in') 
+env.Translate(LINGUAS_FILE = 1, XGETTEXTFROM = 'POTFILES.in')
 </example_commands>
 
 <para>
@@ -2778,7 +2778,7 @@ Let's prepare a development tree as below
 <example_commands>
  project/
   + SConstruct
-  + build/        
+  + build/
   + src/
       + po/
           + SConscript