Skip to content

Commit 3b168f5

Browse files
authored
Merge pull request SCons#4483 from mwichmann/doc/msvc-version
Update MSVC_VERSION usage and table
2 parents 73dcba0 + d730eb9 commit 3b168f5

19 files changed

+398
-311
lines changed

CHANGES.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
9595
would fail with an exception if called with a module which is
9696
not found. It will now return None. Updated manpage entry and
9797
docstring..
98+
- Doc update: standardized on the use of a new entity &MSVC; to
99+
describe the Microsoft C++ compiler. Update the version table slightly.
100+
Amplified the usage of MSVC_VERSION.
98101
- Improve SharedLibrary docs a bit.
99102

100103

SCons/Platform/Platform.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ else:
167167
</para>
168168
<para>
169169
On the <literal>win32</literal> platform,
170-
if the Microsoft Visual C++ compiler is available,
170+
if the &MSVC; compiler is available,
171171
&t-link-msvc; tool setup is done using
172172
&cv-HOST_ARCH; and &cv-link-TARGET_ARCH;.
173173
Changing the values at any later time will not cause
@@ -196,7 +196,7 @@ else:
196196
</para>
197197
<para>
198198
On the <literal>win32</literal> platform,
199-
if the Microsoft Visual C++ compiler is available,
199+
if the &MSVC; compiler is available,
200200
&t-link-msvc; tool setup is done using
201201
&cv-link-HOST_ARCH; and &cv-TARGET_ARCH;.
202202
If a value is not specified,
@@ -323,7 +323,7 @@ and
323323
<para>
324324
The prefix for the name of the temporary file used
325325
to store command lines exceeding &cv-link-MAXLINELENGTH;.
326-
The default prefix is <literal>'@'</literal>, which works for the Microsoft
326+
The default prefix is <literal>'@'</literal>, which works for the &MSVC;
327327
and GNU toolchains on Windows.
328328
Set this appropriately for other toolchains,
329329
for example <literal>'-@'</literal> for the diab compiler

SCons/Tool/mslink.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ when using Microsoft Visual Studio.
8585
<cvar name="PDB">
8686
<summary>
8787
<para>
88-
The Microsoft Visual C++ PDB file that will store debugging information for
88+
The &MSVC; PDB file that will store debugging information for
8989
object files, shared libraries, and programs. This variable is ignored by
90-
tools other than Microsoft Visual C++.
90+
tools other than &MSVC;.
9191
When this variable is
9292
defined SCons will add options to the compiler and linker command line to
9393
cause them to generate external debugging information, and will also set up the
@@ -100,7 +100,7 @@ env['PDB'] = 'hello.pdb'
100100
</example_commands>
101101

102102
<para>
103-
The Visual C++ compiler switch that SCons uses by default
103+
The &MSVC; compiler switch that SCons uses by default
104104
to generate PDB information is <option>/Z7</option>.
105105
This works correctly with parallel (<option>-j</option>) builds
106106
because it embeds the debug information in the intermediate object files,
@@ -238,7 +238,7 @@ and must be supplied by the developer.
238238
If set to true,
239239
&scons;
240240
will add the manifest file
241-
generated by Microsoft Visual C++ 8.0 and later
241+
generated by &MSVC; 8.0 and later
242242
to the target list so &SCons; will be aware they
243243
were generated.
244244
In the case of an executable, the manifest file name
@@ -294,7 +294,7 @@ Defaults to <filename>.exp</filename>.
294294
<summary>
295295
<para>
296296
The prefix used for executable program manifest files
297-
generated by Microsoft Visual C/C++.
297+
generated by &MSVC;.
298298
Defaults to empty.
299299
</para>
300300
</summary>
@@ -304,7 +304,7 @@ Defaults to empty.
304304
<summary>
305305
<para>
306306
The suffix used for executable program manifest files
307-
generated by Microsoft Visual C/C++.
307+
generated by &MSVC;.
308308
Defaults to <filename>.manifest</filename>.
309309
</para>
310310
</summary>
@@ -314,7 +314,7 @@ Defaults to <filename>.manifest</filename>.
314314
<summary>
315315
<para>
316316
The prefix used for shared library manifest files
317-
generated by Microsoft Visual C/C++.
317+
generated by &MSVC;.
318318
Defaults to empty.
319319
</para>
320320
</summary>
@@ -324,7 +324,7 @@ Defaults to empty.
324324
<summary>
325325
<para>
326326
The suffix used for shared library manifest files
327-
generated by Microsoft Visual C/C++.
327+
generated by &MSVC;.
328328
Defaults to <filename>.manifest</filename>.
329329
</para>
330330
</summary>

0 commit comments

Comments
 (0)