Skip to content

Commit f747386

Browse files
jcbrilljcbrill
committed
Convert simple tables to grid tables in MSCommon/README.rst
1 parent 4130840 commit f747386

File tree

1 file changed

+125
-77
lines changed

1 file changed

+125
-77
lines changed

‎SCons/Tool/MSCommon/README.rst

Lines changed: 125 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -33,29 +33,47 @@ MSVC Detection Priority
3333
For msvc version specifications without an 'Exp' suffix, an express
3434
installation is used only when no other installation is detected.
3535

36-
======= ======= ========================================================
37-
Product VCVer Priority
38-
======= ======= ========================================================
39-
VS2022 14.3 Enterprise, Professional, Community, BuildTools
40-
VS2019 14.2 Enterprise, Professional, Community, BuildTools
41-
VS2017 14.1 Enterprise, Professional, Community, BuildTools, Express
42-
VS2017 14.1Exp Express
43-
VS2015 14.0 [Develop, BuildTools, CmdLine], Express
44-
VS2015 14.0Exp Express
45-
VS2013 12.0 Develop, Express
46-
VS2013 12.0Exp Express
47-
VS2012 11.0 Develop, Express
48-
VS2012 11.0Exp Express
49-
VS2010 10.0 Develop, Express
50-
VS2010 10.0Exp Express
51-
VS2008 9.0 Develop, VCForPython, Express
52-
VS2008 9.0Exp Express
53-
VS2005 8.0 Develop, Express
54-
VS2005 8.0Exp Express
55-
VS2003 7.1 Develop
56-
VS2002 7.0 Develop
57-
VS6.0 6.0 Develop
58-
======= ======= ========================================================
36+
+---------+---------+----------------------------------------------------------+
37+
| Product | VCVer | Priority |
38+
+=========+=========+==========================================================+
39+
| VS2022 | 14.3 | Enterprise, Professional, Community, BuildTools |
40+
+---------+---------+----------------------------------------------------------+
41+
| VS2019 | 14.2 | Enterprise, Professional, Community, BuildTools |
42+
+---------+---------+----------------------------------------------------------+
43+
| VS2017 | 14.1 | Enterprise, Professional, Community, BuildTools, Express |
44+
+---------+---------+----------------------------------------------------------+
45+
| VS2017 | 14.1Exp | Express |
46+
+---------+---------+----------------------------------------------------------+
47+
| VS2015 | 14.0 | [Develop, BuildTools, CmdLine], Express |
48+
+---------+---------+----------------------------------------------------------+
49+
| VS2015 | 14.0Exp | Express |
50+
+---------+---------+----------------------------------------------------------+
51+
| VS2013 | 12.0 | Develop, Express |
52+
+---------+---------+----------------------------------------------------------+
53+
| VS2013 | 12.0Exp | Express |
54+
+---------+---------+----------------------------------------------------------+
55+
| VS2012 | 11.0 | Develop, Express |
56+
+---------+---------+----------------------------------------------------------+
57+
| VS2012 | 11.0Exp | Express |
58+
+---------+---------+----------------------------------------------------------+
59+
| VS2010 | 10.0 | Develop, Express |
60+
+---------+---------+----------------------------------------------------------+
61+
| VS2010 | 10.0Exp | Express |
62+
+---------+---------+----------------------------------------------------------+
63+
| VS2008 | 9.0 | Develop, VCForPython, Express |
64+
+---------+---------+----------------------------------------------------------+
65+
| VS2008 | 9.0Exp | Express |
66+
+---------+---------+----------------------------------------------------------+
67+
| VS2005 | 8.0 | Develop, Express |
68+
+---------+---------+----------------------------------------------------------+
69+
| VS2005 | 8.0Exp | Express |
70+
+---------+---------+----------------------------------------------------------+
71+
| VS2003 | 7.1 | Develop |
72+
+---------+---------+----------------------------------------------------------+
73+
| VS2002 | 7.0 | Develop |
74+
+---------+---------+----------------------------------------------------------+
75+
| VS6.0 | 6.0 | Develop |
76+
+---------+---------+----------------------------------------------------------+
5977

6078
Legend:
6179

@@ -336,29 +354,36 @@ Batch File Arguments
336354

337355
Supported MSVC batch file arguments by product:
338356

339-
======== ======= ======= ======== =======
340-
Product UWP SDK Toolset Spectre
341-
======== ======= ======= ======== =======
342-
VS2022 X X X X
343-
VS2019 X X X X
344-
VS2017 X X X X
345-
VS2015 X [1]_ X [2]_
346-
======== ======= ======= ======== =======
357+
+---------+---------+--------+---------+---------+
358+
| Product | UWP | SDK | Toolset | Spectre |
359+
+=========+=========+========+=========+=========+
360+
| VS2022 | X | X | X | X |
361+
+---------+---------+--------+---------+---------+
362+
| VS2019 | X | X | X | X |
363+
+---------+---------+--------+---------+---------+
364+
| VS2017 | X | X | X | X |
365+
+---------+---------+--------+---------+---------+
366+
| VS2015 | X [1]_ | X [2]_ | | |
367+
+---------+---------+--------+---------+---------+
368+
347369

348370
.. [1] The BuildTools edition does not support the ``store`` argument. The Express edition
349371
supports the ``store`` argument for the ``x86`` target only.
350372
.. [2] The ``sdk version`` argument is not supported in the BuildTools and Express editions.
351373
352374
Supported MSVC batch file arguments in SCons:
353375

354-
======== ====================================== ===================================================
355-
Argument Construction Variable Script Argument Equivalent
356-
======== ====================================== ===================================================
357-
UWP ``MSVC_UWP_APP=True`` ``MSVC_SCRIPT_ARGS='store'``
358-
SDK ``MSVC_SDK_VERSION='10.0.20348.0'`` ``MSVC_SCRIPT_ARGS='10.0.20348.0'``
359-
Toolset ``MSVC_TOOLSET_VERSION='14.31.31103'`` ``MSVC_SCRIPT_ARGS='-vcvars_ver=14.31.31103'``
360-
Spectre ``MSVC_SPECTRE_LIBS=True`` ``MSVC_SCRIPT_ARGS='-vcvars_spectre_libs=spectre'``
361-
======== ====================================== ===================================================
376+
+----------+----------------------------------------+-----------------------------------------------------+
377+
| Argument | Construction Variable | Script Argument Equivalent |
378+
+==========+========================================+=====================================================+
379+
| UWP | ``MSVC_UWP_APP=True`` | ``MSVC_SCRIPT_ARGS='store'`` |
380+
+----------+----------------------------------------+-----------------------------------------------------+
381+
| SDK | ``MSVC_SDK_VERSION='10.0.20348.0'`` | ``MSVC_SCRIPT_ARGS='10.0.20348.0'`` |
382+
+----------+----------------------------------------+-----------------------------------------------------+
383+
| Toolset | ``MSVC_TOOLSET_VERSION='14.31.31103'`` | ``MSVC_SCRIPT_ARGS='-vcvars_ver=14.31.31103'`` |
384+
+----------+----------------------------------------+-----------------------------------------------------+
385+
| Spectre | ``MSVC_SPECTRE_LIBS=True`` | ``MSVC_SCRIPT_ARGS='-vcvars_spectre_libs=spectre'`` |
386+
+----------+----------------------------------------+-----------------------------------------------------+
362387

363388
**MSVC_SCRIPT_ARGS contents are not validated. Utilizing script arguments that have construction
364389
variable equivalents is discouraged and may lead to difficult to diagnose build errors.**
@@ -465,12 +490,13 @@ Visual Studio Version Notes
465490
SDK Versions
466491
------------
467492

468-
==== =================
469-
SDK Format
470-
==== =================
471-
10.0 10.0.XXXXX.Y [*]_
472-
8.1 8.1
473-
==== =================
493+
+------+-------------------+
494+
| SDK | Format |
495+
+======+===================+
496+
| 10.0 | 10.0.XXXXX.Y [*]_ |
497+
+------+-------------------+
498+
| 8.1 | 8.1 |
499+
+------+-------------------+
474500

475501
.. [*] The Windows 10 SDK version number is 10.0.20348.0 and earlier.
476502
@@ -479,42 +505,64 @@ SDK Format
479505
BuildTools Versions
480506
-------------------
481507

482-
========== ===== ===== ========
483-
BuildTools VCVER CLVER MSVCRT
484-
========== ===== ===== ========
485-
v143 14.3 19.3 140/ucrt
486-
v142 14.2 19.2 140/ucrt
487-
v141 14.1 19.1 140/ucrt
488-
v140 14.0 19.0 140/ucrt
489-
v120 12.0 18.0 120
490-
v110 11.0 17.0 110
491-
v100 10.0 16.0 100
492-
v90 9.0 15.0 90
493-
v80 8.0 14.0 80
494-
v71 7.1 13.1 71
495-
v70 7.0 13.0 70
496-
v60 6.0 12.0 60
497-
========== ===== ===== ========
508+
+------------+-------+-------+----------+
509+
| BuildTools | VCVER | CLVER | MSVCRT |
510+
+============+=======+=======+==========+
511+
| v143 | 14.3 | 19.3 | 140/ucrt |
512+
+------------+-------+-------+----------+
513+
| v142 | 14.2 | 19.2 | 140/ucrt |
514+
+------------+-------+-------+----------+
515+
| v141 | 14.1 | 19.1 | 140/ucrt |
516+
+------------+-------+-------+----------+
517+
| v140 | 14.0 | 19.0 | 140/ucrt |
518+
+------------+-------+-------+----------+
519+
| v120 | 12.0 | 18.0 | 120 |
520+
+------------+-------+-------+----------+
521+
| v110 | 11.0 | 17.0 | 110 |
522+
+------------+-------+-------+----------+
523+
| v100 | 10.0 | 16.0 | 100 |
524+
+------------+-------+-------+----------+
525+
| v90 | 9.0 | 15.0 | 90 |
526+
+------------+-------+-------+----------+
527+
| v80 | 8.0 | 14.0 | 80 |
528+
+------------+-------+-------+----------+
529+
| v71 | 7.1 | 13.1 | 71 |
530+
+------------+-------+-------+----------+
531+
| v70 | 7.0 | 13.0 | 70 |
532+
+------------+-------+-------+----------+
533+
| v60 | 6.0 | 12.0 | 60 |
534+
+------------+-------+-------+----------+
498535

499536
Product Versions
500537
----------------
501538

502-
========= ====== ========== ======================
503-
Product VSVER SDK BuildTools
504-
========= ====== ========== ======================
505-
2022 17.0 10.0, 8.1 v143, v142, v141, v140
506-
2019 16.0 10.0, 8.1 v142, v141, v140
507-
2017 15.0 10.0, 8.1 v141, v140
508-
2015 14.0 10.0, 8.1 v140
509-
2013 12.0 v120
510-
2012 11.0 v110
511-
2010 10.0 v100
512-
2008 9.0 v90
513-
2005 8.0 v80
514-
2003.NET 7.1 v71
515-
2002.NET 7.0 v70
516-
6.0 6.0 v60
517-
========= ====== ========== ======================
539+
+----------+-------+-----------+------------------------+
540+
| Product | VSVER | SDK | BuildTools |
541+
+==========+=======+===========+========================+
542+
| 2022 | 17.0 | 10.0, 8.1 | v143, v142, v141, v140 |
543+
+----------+-------+-----------+------------------------+
544+
| 2019 | 16.0 | 10.0, 8.1 | v142, v141, v140 |
545+
+----------+-------+-----------+------------------------+
546+
| 2017 | 15.0 | 10.0, 8.1 | v141, v140 |
547+
+----------+-------+-----------+------------------------+
548+
| 2015 | 14.0 | 10.0, 8.1 | v140 |
549+
+----------+-------+-----------+------------------------+
550+
| 2013 | 12.0 | | v120 |
551+
+----------+-------+-----------+------------------------+
552+
| 2012 | 11.0 | | v110 |
553+
+----------+-------+-----------+------------------------+
554+
| 2010 | 10.0 | | v100 |
555+
+----------+-------+-----------+------------------------+
556+
| 2008 | 9.0 | | v90 |
557+
+----------+-------+-----------+------------------------+
558+
| 2005 | 8.0 | | v80 |
559+
+----------+-------+-----------+------------------------+
560+
| 2003.NET | 7.1 | | v71 |
561+
+----------+-------+-----------+------------------------+
562+
| 2002.NET | 7.0 | | v70 |
563+
+----------+-------+-----------+------------------------+
564+
| 6.0 | 6.0 | | v60 |
565+
+----------+-------+-----------+------------------------+
518566

519567

520568
SCons Implementation Notes

0 commit comments

Comments
 (0)