From 274d67cbdac1d696d8924d97f81ff27e88202dbf Mon Sep 17 00:00:00 2001
From: Adam Mitz <mitza@ociweb.com>
Date: Thu, 23 Mar 2017 13:37:03 -0500
Subject: MPC's "-type vc15" is now vs2017

---
 ACE/ace/config-win32-msvc-141.h                   | 30 +++++++++++++++++++++++
 ACE/ace/config-win32-msvc-15.h                    | 30 -----------------------
 ACE/ace/config-win32-msvc.h                       |  2 +-
 ACE/bin/MakeProjectCreator/config/vc15.features   |  4 ---
 ACE/bin/MakeProjectCreator/config/vc15nmake.mpb   | 24 ------------------
 ACE/bin/MakeProjectCreator/config/vs2017.features |  4 +++
 ACE/bin/MakeProjectCreator/config/vs2017nmake.mpb | 24 ++++++++++++++++++
 ACE/bin/make_release.py                           |  6 ++---
 8 files changed, 62 insertions(+), 62 deletions(-)
 create mode 100644 ACE/ace/config-win32-msvc-141.h
 delete mode 100644 ACE/ace/config-win32-msvc-15.h
 delete mode 100644 ACE/bin/MakeProjectCreator/config/vc15.features
 delete mode 100644 ACE/bin/MakeProjectCreator/config/vc15nmake.mpb
 create mode 100644 ACE/bin/MakeProjectCreator/config/vs2017.features
 create mode 100644 ACE/bin/MakeProjectCreator/config/vs2017nmake.mpb

diff --git a/ACE/ace/config-win32-msvc-141.h b/ACE/ace/config-win32-msvc-141.h
new file mode 100644
index 00000000000..1067638a7bf
--- /dev/null
+++ b/ACE/ace/config-win32-msvc-141.h
@@ -0,0 +1,30 @@
+/* -*- C++ -*- */
+//=============================================================================
+/**
+ *  @file   config-win32-msvc-15.h
+ *
+ *  @brief  Microsoft Visual C++ 15.0 configuration file.
+ *
+ *  This file is the ACE configuration file for Microsoft Visual C++ version 2017.
+ *
+ *  @note Do not include this file directly, include config-win32.h instead.
+ */
+//=============================================================================
+
+#ifndef ACE_CONFIG_WIN32_MSVC_15_H
+#define ACE_CONFIG_WIN32_MSVC_15_H
+#include /**/ "ace/pre.h"
+
+#ifndef ACE_CONFIG_WIN32_H
+#error Use config-win32.h in config.h instead of this header
+#endif /* ACE_CONFIG_WIN32_H */
+
+#ifndef ACE_WIN32_VC15
+#  define ACE_WIN32_VC15
+#endif
+
+// Until we have specific msvc15 settings, include the msvc12 file
+#include "ace/config-win32-msvc-14.h"
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_WIN32_MSVC_15_H */
diff --git a/ACE/ace/config-win32-msvc-15.h b/ACE/ace/config-win32-msvc-15.h
deleted file mode 100644
index 1067638a7bf..00000000000
--- a/ACE/ace/config-win32-msvc-15.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file   config-win32-msvc-15.h
- *
- *  @brief  Microsoft Visual C++ 15.0 configuration file.
- *
- *  This file is the ACE configuration file for Microsoft Visual C++ version 2017.
- *
- *  @note Do not include this file directly, include config-win32.h instead.
- */
-//=============================================================================
-
-#ifndef ACE_CONFIG_WIN32_MSVC_15_H
-#define ACE_CONFIG_WIN32_MSVC_15_H
-#include /**/ "ace/pre.h"
-
-#ifndef ACE_CONFIG_WIN32_H
-#error Use config-win32.h in config.h instead of this header
-#endif /* ACE_CONFIG_WIN32_H */
-
-#ifndef ACE_WIN32_VC15
-#  define ACE_WIN32_VC15
-#endif
-
-// Until we have specific msvc15 settings, include the msvc12 file
-#include "ace/config-win32-msvc-14.h"
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CONFIG_WIN32_MSVC_15_H */
diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h
index 993da2e5298..983d230f626 100644
--- a/ACE/ace/config-win32-msvc.h
+++ b/ACE/ace/config-win32-msvc.h
@@ -39,7 +39,7 @@
 
 //FUZZ: disable check_for_msc_ver
 #if (_MSC_VER >= 1910)
-# include "ace/config-win32-msvc-15.h"
+# include "ace/config-win32-msvc-141.h"
 #elif (_MSC_VER >= 1900)
 # include "ace/config-win32-msvc-14.h"
 #elif (_MSC_VER >= 1800)
diff --git a/ACE/bin/MakeProjectCreator/config/vc15.features b/ACE/bin/MakeProjectCreator/config/vc15.features
deleted file mode 100644
index ef609219456..00000000000
--- a/ACE/bin/MakeProjectCreator/config/vc15.features
+++ /dev/null
@@ -1,4 +0,0 @@
-ssl=0
-qos=1
-rwho=0
-sctp=0
diff --git a/ACE/bin/MakeProjectCreator/config/vc15nmake.mpb b/ACE/bin/MakeProjectCreator/config/vc15nmake.mpb
deleted file mode 100644
index 84ea914a679..00000000000
--- a/ACE/bin/MakeProjectCreator/config/vc15nmake.mpb
+++ /dev/null
@@ -1,24 +0,0 @@
-// -*- MPC -*-
-feature (nmake_avoid_Wp64) {
-  specific(nmake) {
-    add_compile -= /Wp64
-  }
-}
-
-feature(vc_avoid_hides_local_declaration) {
-  specific(nmake) {
-    DisableSpecificWarnings += 4456
-  }
-}
-
-feature(vc_avoid_hides_global_declaration) {
-  specific(nmake) {
-    DisableSpecificWarnings += 4459
-  }
-}
-
-feature(vc_avoid_hides_class_member) {
-  specific(nmake) {
-    DisableSpecificWarnings += 4458
-  }
-}
diff --git a/ACE/bin/MakeProjectCreator/config/vs2017.features b/ACE/bin/MakeProjectCreator/config/vs2017.features
new file mode 100644
index 00000000000..ef609219456
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/vs2017.features
@@ -0,0 +1,4 @@
+ssl=0
+qos=1
+rwho=0
+sctp=0
diff --git a/ACE/bin/MakeProjectCreator/config/vs2017nmake.mpb b/ACE/bin/MakeProjectCreator/config/vs2017nmake.mpb
new file mode 100644
index 00000000000..84ea914a679
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/vs2017nmake.mpb
@@ -0,0 +1,24 @@
+// -*- MPC -*-
+feature (nmake_avoid_Wp64) {
+  specific(nmake) {
+    add_compile -= /Wp64
+  }
+}
+
+feature(vc_avoid_hides_local_declaration) {
+  specific(nmake) {
+    DisableSpecificWarnings += 4456
+  }
+}
+
+feature(vc_avoid_hides_global_declaration) {
+  specific(nmake) {
+    DisableSpecificWarnings += 4459
+  }
+}
+
+feature(vc_avoid_hides_class_member) {
+  specific(nmake) {
+    DisableSpecificWarnings += 4458
+  }
+}
diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py
index 8add6e145c3..fa08c05e4d9 100755
--- a/ACE/bin/make_release.py
+++ b/ACE/bin/make_release.py
@@ -888,7 +888,7 @@ def generate_workspaces (stage_dir):
     msvc_exclude_option = ' '
     vc12_option = ' -name_modifier *_vc12 '
     vc14_option = ' -name_modifier *_vc14 '
-    vc15_option = ' -name_modifier *_vc15 '
+    vs2017_option = ' -name_modifier *_vs2017 '
 
     redirect_option = str ()
     if not opts.verbose:
@@ -903,8 +903,8 @@ def generate_workspaces (stage_dir):
     print "\tGenerating VC14 solutions..."
     ex (mpc_command + " -type vc14 "  + msvc_exclude_option + mpc_option + workers_option + vc14_option + redirect_option)
 
-    print "\tGenerating VC15 solutions..."
-    ex (mpc_command + " -type vc15 "  + msvc_exclude_option + mpc_option + workers_option + vc15_option + redirect_option)
+    print "\tGenerating VS2017 solutions..."
+    ex (mpc_command + " -type vs2017 "  + msvc_exclude_option + mpc_option + workers_option + vs2017_option + redirect_option)
 
     print "\tCorrecting permissions for all generated files..."
     ex ("find ./ -name '*.vc[p,w]' -or -name '*.bmak' -or -name '*.vcproj' -or -name '*.sln' -or -name '*.vcxproj' -or -name '*.filters' -or -name 'GNUmake*' | xargs chmod 0644")
-- 
cgit v1.2.1