From 22ad1c833ed7ef0909363175e698477dbe3f9e3a Mon Sep 17 00:00:00 2001
From: Adam Mitz <mitza@objectcomputing.com>
Date: Tue, 9 Nov 2021 10:35:31 -0600
Subject: Documentation and script updates for vs2022

---
 docs/USAGE                        |  5 +++--
 docs/html/MakeProjectCreator.html | 24 ++++++++++++++++++------
 2 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'docs')

diff --git a/docs/USAGE b/docs/USAGE
index c0c8dfa7..49b3c5d1 100644
--- a/docs/USAGE
+++ b/docs/USAGE
@@ -25,8 +25,9 @@ Usage: mwc.pl [-global <file>] [-include <directory>] [-recurse]
               [-language <cplusplus | csharp | java | vb>]
               [-type <automake | bcb2007 | bcb2009 | bds4 | bmake | cc | cdt6 |
                       cdt7 | em3 | ghs | html | iar | make | nmake | rpmspec |
-                      sle | uvis | vc6 | vc7 | vc8 | vc9 | vc10 | vc11 | vc12 |
-                      vc14 | vs2017 | vs2019 | vc71 | wb26 | wb30 | wix>]
+                      sle | uvis | vc6 | vc7 | vc71 | vc8 | vc9 | vc10 | vc11 |
+                      vc12 | vc14 | vs2017 | vs2019 | vs2022 | wb26 | wb30 |
+                      wix>]
               [files]
 
        -base           Add <project> as a base project to each generated
diff --git a/docs/html/MakeProjectCreator.html b/docs/html/MakeProjectCreator.html
index d2d8dc92..6e59a72b 100644
--- a/docs/html/MakeProjectCreator.html
+++ b/docs/html/MakeProjectCreator.html
@@ -527,6 +527,18 @@
                   </td>
                 </tr>
 
+                <tr>
+                  <td rowspan="1" colspan="1">
+                    <p class="TblCode">
+                      <em class="TableCode">vs2022</em>
+                    </p>
+                  </td>
+
+                  <td rowspan="1" colspan="1">
+                    <p class="Tbl-Body">Visual Studio 2022.</p>
+                  </td>
+                </tr>
+
                 <tr>
                   <td rowspan="1" colspan="1">
                     <p class="TblCode">
@@ -1838,7 +1850,7 @@ class="XRef">the -workers_port option</a>,
           "Code">vc7</em>, <em class="Code">vc71</em>, <em class="Code">vc8</em>,
           <em class="Code">vc9</em>, <em class="Code">vc10</em>, <em class="Code">vc11</em>,
               <em class="Code">vc12</em>, <em class="Code">vc14</em>,
-              <em class="Code">vs2017</em>, and <em class="Code">vs2019</em> project types. If this environment
+              and <em class="Code">vs*</em> project types. If this environment
               variable is set, MPC will generate inter-project dependencies for
               libraries within a single workspace. This is usually not desired
               since adding these dependencies in a static workspace has the side
@@ -1994,7 +2006,7 @@ class="XRef">the -workers_port option</a>,
 
                 <p class="Code">
                   &nbsp;&nbsp;exclude(vc6, vc7, vc71, vc8, vc9,
-                  vc10, vc11, vc12, vc14, vs2017, vs2019, nmake) {
+                  vc10, vc11, vc12, vc14, vs2017, vs2019, vs2022, nmake) {
                 </p>
 
                 <p class="Code">&nbsp;&nbsp;&nbsp;&nbsp;this_directory</p>
@@ -2603,7 +2615,7 @@ class="Code">specific</em> clause.
                             <em class="Code">vc10</em>, <em class="Code">vc11</em>,
                             <em class="Code">vc12</em>, <em class="Code">vc14</em>,
                             <em class="Code">vc12</em>, <em class="Code">vc14</em>,
-                            <em class="Code">vs2017</em>, and <em class="Code">vs2019</em> project types.
+                            and <em class="Code">vs*</em> project types.
                           </p>
                         </td>
                       </tr>
@@ -3250,7 +3262,7 @@ class="Code">specific</em> clause.
               "Code">vc7</em>, <em class="Code">vc71</em>, <em class="Code">vc8</em>,
               <em class="Code">vc9</em>, <em class="Code">vc10</em>, <em class="Code">vc11</em>,
               <em class="Code">vc12</em>, <em class="Code">vc14</em>,
-              <em class="Code">vs2017</em>, and <em class="Code">vs2019</em> project types.
+              and <em class="Code">vs*</em> project types.
                 </p>
 
                 <p class="Body">
@@ -8110,7 +8122,7 @@ class="Code">specific</em> clause.
                           7.10 is return for vc71 and 8.00 is returned for vc8,
                           9.00 is returned for vc9, 10.00 is returned for vc10,
                           11.00 is returned for vc11, 12.0 is returned for vc12,
-                          14.0 is returned for vc14, 14.1 is returned for vs2017, 14.2 is returned for vs2019.
+                          14.0 is returned for vc14, 14.1 is returned for vs2017, 14.2 is returned for vs2019, 14.3 is returned for vs2022.
                         </p>
                       </td>
                     </tr>
@@ -8428,7 +8440,7 @@ class="Code">specific</em> clause.
                     <p class="Body">
                       Certain project types don't support the same
                       input file used by multiple custom types (current examples of
-                      this are vc10, vc11, vc12, vc14, vs2017, vs2019, cdt6, and cdt7). To accommodate these types, MPC
+                      this are vc10, vc11, vc12, vc14, vs*, cdt6, and cdt7). To accommodate these types, MPC
                       has a capability called "combined custom".  With this capability
                       enabled in the specific ProjectCreator, MPC will "fold together"
                       the multiple custom steps so that the target tool (Visual Studio
-- 
cgit v1.2.1