Renamed "-type vc15" to vs2017. Updated documentation.

DOCGroup · Mar 23, 2017 · f768f02 · f768f02
1 parent 00101c3
commit f768f02
Show file tree

Hide file tree

Showing 18 changed files with 34 additions and 33 deletions.
diff --git a/config/pin_base.mpb b/config/pin_base.mpb
@@ -13,7 +13,7 @@ project {
     compile_flags += /Oy
   }
 
-  specific (vc10, vc11, vc12, vc14, vc15) {
+  specific (vc10, vc11, vc12, vc14, vs2017) {
     runtime_library = MultiThreaded
     ImageHasSafeExceptionHandlers = false
 

diff --git a/config/pintool.mpb b/config/pintool.mpb
@@ -41,7 +41,7 @@ feature (ia32) {
     link_options += /ENTRY:Ptrace_DllMainCRTStartup@12
   }
 
-  specific (vc10, vc11, vc12, vc14, vc15) {
+  specific (vc10, vc11, vc12, vc14, vs2017) {
     EntryPointSymbol = Ptrace_DllMainCRTStartup@12
   }
 }
@@ -51,7 +51,7 @@ feature (intel64) {
     link_options += /ENTRY:Ptrace_DllMainCRTStartup
   }
 
-  specific (vc10, vc11, vc12, vc14, vc15) {
+  specific (vc10, vc11, vc12, vc14, vs2017) {
     EntryPointSymbol = Ptrace_DllMainCRTStartup
   }
 }
diff --git a/config/winapp.mpb b/config/winapp.mpb
@@ -5,7 +5,7 @@ project {
   } else {
     subsystem = 2
   }
-  specific(vc10, vc11, vc12, vc14, vc15) {
+  specific(vc10, vc11, vc12, vc14, vs2017) {
     subsystem = Windows
   }
 }
diff --git a/config/wireshark.mpb b/config/wireshark.mpb
@@ -26,7 +26,7 @@ project : glib {
   specific(vc14) {
     macros      += MSC_VER_REQUIRED=1900
   }
-  specific(vc15) {
+  specific(vs2017) {
     macros      += MSC_VER_REQUIRED=1910
   }
   verbatim(nmake, top) {

diff --git a/docs/README b/docs/README
@@ -211,7 +211,7 @@ managed         This keyword can be used as a global setting or as a source
                 component scoped setting (ie. inside the scope of
                 Source_Files).  It specifies that the source files should be
                 compiled as managed C++.  Since this is Microsoft specific, it
-                is only supported by the nmake, vc7 - vc14
+                is only supported by the nmake, vc7 - vc14, and vs*
                 project types.
 no_pch          This keyword can only be used as a source component scoped
                 setting (ie. inside the scope of Source_Files).  It
@@ -356,6 +356,7 @@ specific        This scope allows assignments that are specific to a
                 vc11     |         |      |     X     |    X    |
                 vc12     |         |      |     X     |    X    |
                 vc14     |         |      |     X     |    X    |
+                vs2017   |         |      |     X     |    X    |
                 wix      |         |      |           |    X    |
 
                 ? - indicates that this is controlled by the MPC_GHS_UNIX

diff --git a/docs/html/MakeProjectCreator.html b/docs/html/MakeProjectCreator.html
@@ -506,7 +506,7 @@ <h6 class="NumberedTableTitle">MPC Types</h6>
                 <tr>
                   <td rowspan="1" colspan="1">
                     <p class="TblCode">
-                      <em class="TableCode">vc15</em>
+                      <em class="TableCode">vs2017</em>
                     </p>
                   </td>
 

diff --git a/modules/VC15ProjectCreator.pm → modules/VS2017ProjectCreator.pm b/modules/VC15ProjectCreator.pm → modules/VS2017ProjectCreator.pm
@@ -1,7 +1,7 @@
-package VC15ProjectCreator;
+package VS2017ProjectCreator;
 
 # ************************************************************
-# Description   : A vc15 (Visual Studio 2017) Project Creator
+# Description   : A vs2017 (Visual Studio 2017) Project Creator
 # Author        : Johnny Willemsen
 # Create Date   : 1/04/2016
 # ************************************************************
@@ -19,10 +19,10 @@ use vars qw(@ISA);
 
 ## NOTE: We call the constant as a function to support Perl 5.6.
 my %info = (Creator::cplusplus() => {'ext'      => '.vcxproj',
-                                     'dllexe'   => 'vc15exe',
-                                     'libexe'   => 'vc15libexe',
-                                     'dll'      => 'vc15dll',
-                                     'lib'      => 'vc15lib',
+                                     'dllexe'   => 'vs2017exe',
+                                     'libexe'   => 'vs2017libexe',
+                                     'dll'      => 'vs2017dll',
+                                     'lib'      => 'vs2017lib',
                                      'template' => [ 'vc10', 'vc10filters' ],
                                     },
            );

diff --git a/modules/VC15WorkspaceCreator.pm → modules/VS2017WorkspaceCreator.pm b/modules/VC15WorkspaceCreator.pm → modules/VS2017WorkspaceCreator.pm
@@ -1,7 +1,7 @@
-package VC15WorkspaceCreator;
+package VS2017WorkspaceCreator;
 
 # ************************************************************
-# Description   : A vc15 (Visual Studio 2017) Workspace Creator
+# Description   : A vs2017 (Visual Studio 2017) Workspace Creator
 # Author        : Johnny Willemsen
 # Create Date   : 01/05/2016
 # ************************************************************
@@ -12,7 +12,7 @@ package VC15WorkspaceCreator;
 
 use strict;
 
-use VC15ProjectCreator;
+use VS2017ProjectCreator;
 use VC12WorkspaceCreator;
 
 use vars qw(@ISA);

diff --git a/registry.pl b/registry.pl
@@ -36,7 +36,7 @@
                'vc11'  => ['SLN 11.0', 'VCPROJ 11.0'],
                'vc12'  => ['SLN 12.0', 'VCPROJ 12.0'],
                'vc14'  => ['SLN 14.0', 'VCPROJ 14.0'],
-               'vc15'  => ['SLN 15.0', 'VCPROJ 15.0'],
+               'vs2017' => ['SLN 2017', 'PROJ 2017'],
                'wix'   => ['WiX', 'WiX Project'],
               );
 

diff --git a/templates/vc15dll.mpt b/templates/vc15dll.mpt
diff --git a/templates/vc15exe.mpt b/templates/vc15exe.mpt
diff --git a/templates/vc15lib.mpt b/templates/vc15lib.mpt
diff --git a/templates/vc15libexe.mpt b/templates/vc15libexe.mpt
diff --git a/templates/vs2017dll.mpt b/templates/vs2017dll.mpt
@@ -0,0 +1,4 @@
+// -*- MPC -*-
+conditional_include "vs2017platforms"
+conditional_include "vc1xdll"
+conditional_include "user_vs2017dll"
diff --git a/templates/vs2017exe.mpt b/templates/vs2017exe.mpt
@@ -0,0 +1,4 @@
+// -*- MPC -*-
+conditional_include "vs2017platforms"
+conditional_include "vc1xexe"
+conditional_include "user_vs2017exe"
diff --git a/templates/vs2017lib.mpt b/templates/vs2017lib.mpt
@@ -0,0 +1,4 @@
+// -*- MPC -*-
+conditional_include "vs2017platforms"
+conditional_include "vc1xlib"
+conditional_include "user_vs2017lib"
diff --git a/templates/vs2017libexe.mpt b/templates/vs2017libexe.mpt
@@ -0,0 +1,4 @@
+// -*- MPC -*-
+conditional_include "vs2017platforms"
+conditional_include "vc1xlibexe"
+conditional_include "user_vs2017libexe"
diff --git a/templates/vc15platforms.mpt → templates/vs2017platforms.mpt b/templates/vc15platforms.mpt → templates/vs2017platforms.mpt