Merge pull request #379 from mitza-oci/master

Updates to work with MPC's changes for vc15 -> vs2017

5 files changed, 12 insertions, 13 deletions

diff --git a/ACE/ace/config-win32-msvc-15.h b/ACE/ace/config-win32-msvc-141.h
index 1067638a7bf..330df3e56f7 100644
--- a/ACE/ace/config-win32-msvc-15.h
+++ b/ACE/ace/config-win32-msvc-141.h
@@ -1,30 +1,29 @@
 /* -*- C++ -*- */
 //=============================================================================
 /**
- *  @file   config-win32-msvc-15.h
+ *  @file   config-win32-msvc-141.h
  *
- *  @brief  Microsoft Visual C++ 15.0 configuration file.
+ *  @brief  Microsoft Visual C++ 14.1 configuration file.
  *
- *  This file is the ACE configuration file for Microsoft Visual C++ version 2017.
+ *  This file is the ACE configuration file for Microsoft Visual C++ 14.1 (as released with Visual Studio 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
+#ifndef ACE_CONFIG_WIN32_MSVC_141_H
+#define ACE_CONFIG_WIN32_MSVC_141_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
+#ifndef ACE_WIN32_VC141
+#  define ACE_WIN32_VC141
 #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 */
+#endif /* ACE_CONFIG_WIN32_MSVC_141_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/vs2017.features
index ef609219456..ef609219456 100644
--- a/ACE/bin/MakeProjectCreator/config/vc15.features
+++ b/ACE/bin/MakeProjectCreator/config/vs2017.features
diff --git a/ACE/bin/MakeProjectCreator/config/vc15nmake.mpb b/ACE/bin/MakeProjectCreator/config/vs2017nmake.mpb
index 84ea914a679..84ea914a679 100644
--- a/ACE/bin/MakeProjectCreator/config/vc15nmake.mpb
+++ b/ACE/bin/MakeProjectCreator/config/vs2017nmake.mpb
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")