diff options
| author | Adam Mitz <mitza@ociweb.com> | 2017-03-23 13:37:03 -0500 |
|---|---|---|
| committer | Adam Mitz <mitza@ociweb.com> | 2017-03-23 13:37:03 -0500 |
| commit | 274d67cbdac1d696d8924d97f81ff27e88202dbf (patch) | |
| tree | c6f31dc6b87b58c6e46e64b019d723e493fdb6fc | |
| parent | 00b8e0b09187145be9535fa85cbab82877a61495 (diff) | |
| download | ATCD-274d67cbdac1d696d8924d97f81ff27e88202dbf.tar.gz | |
MPC's "-type vc15" is now vs2017
| -rw-r--r-- | ACE/ace/config-win32-msvc-141.h (renamed from ACE/ace/config-win32-msvc-15.h) | 0 | ||||
| -rw-r--r-- | ACE/ace/config-win32-msvc.h | 2 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/vs2017.features (renamed from ACE/bin/MakeProjectCreator/config/vc15.features) | 0 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/vs2017nmake.mpb (renamed from ACE/bin/MakeProjectCreator/config/vc15nmake.mpb) | 0 | ||||
| -rwxr-xr-x | ACE/bin/make_release.py | 6 |
5 files changed, 4 insertions, 4 deletions
diff --git a/ACE/ace/config-win32-msvc-15.h b/ACE/ace/config-win32-msvc-141.h index 1067638a7bf..1067638a7bf 100644 --- a/ACE/ace/config-win32-msvc-15.h +++ b/ACE/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") |