OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "tools/gn/visual_studio_writer.h" | 5 #include "tools/gn/visual_studio_writer.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <iterator> | 8 #include <iterator> |
9 #include <map> | 9 #include <map> |
10 #include <memory> | 10 #include <memory> |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 void operator()(std::ostream& out) const { | 64 void operator()(std::ostream& out) const { |
65 path_output_.WriteFile(out, source_file_); | 65 path_output_.WriteFile(out, source_file_); |
66 } | 66 } |
67 | 67 |
68 PathOutput& path_output_; | 68 PathOutput& path_output_; |
69 const SourceFile& source_file_; | 69 const SourceFile& source_file_; |
70 }; | 70 }; |
71 | 71 |
72 const char kToolsetVersionVs2013[] = "v120"; // Visual Studio 2013 | 72 const char kToolsetVersionVs2013[] = "v120"; // Visual Studio 2013 |
73 const char kToolsetVersionVs2015[] = "v140"; // Visual Studio 2015 | 73 const char kToolsetVersionVs2015[] = "v140"; // Visual Studio 2015 |
| 74 const char kToolsetVersionVs2017[] = "v141"; // Visual Studio 2017 |
74 const char kProjectVersionVs2013[] = "12.0"; // Visual Studio 2013 | 75 const char kProjectVersionVs2013[] = "12.0"; // Visual Studio 2013 |
75 const char kProjectVersionVs2015[] = "14.0"; // Visual Studio 2015 | 76 const char kProjectVersionVs2015[] = "14.0"; // Visual Studio 2015 |
| 77 const char kProjectVersionVs2017[] = "15.0"; // Visual Studio 2015 |
76 const char kVersionStringVs2013[] = "Visual Studio 2013"; // Visual Studio 2013 | 78 const char kVersionStringVs2013[] = "Visual Studio 2013"; // Visual Studio 2013 |
77 const char kVersionStringVs2015[] = "Visual Studio 2015"; // Visual Studio 2015 | 79 const char kVersionStringVs2015[] = "Visual Studio 2015"; // Visual Studio 2015 |
| 80 const char kVersionStringVs2017[] = "Visual Studio 2017"; // Visual Studio 2017 |
78 const char kWindowsKitsVersion[] = "10"; // Windows 10 SDK | 81 const char kWindowsKitsVersion[] = "10"; // Windows 10 SDK |
79 const char kWindowsKitsIncludeVersion[] = "10.0.14393.0"; // Windows 10 SDK | 82 const char kWindowsKitsIncludeVersion[] = "10.0.14393.0"; // Windows 10 SDK |
80 | 83 |
81 const char kGuidTypeProject[] = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"; | 84 const char kGuidTypeProject[] = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"; |
82 const char kGuidTypeFolder[] = "{2150E333-8FDC-42A3-9474-1A3956D46DE8}"; | 85 const char kGuidTypeFolder[] = "{2150E333-8FDC-42A3-9474-1A3956D46DE8}"; |
83 const char kGuidSeedProject[] = "project"; | 86 const char kGuidSeedProject[] = "project"; |
84 const char kGuidSeedFolder[] = "folder"; | 87 const char kGuidSeedFolder[] = "folder"; |
85 const char kGuidSeedFilter[] = "filter"; | 88 const char kGuidSeedFilter[] = "filter"; |
86 | 89 |
87 const char kConfigurationName[] = "GN"; | 90 const char kConfigurationName[] = "GN"; |
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 case Version::Vs2013: | 269 case Version::Vs2013: |
267 project_version_ = kProjectVersionVs2013; | 270 project_version_ = kProjectVersionVs2013; |
268 toolset_version_ = kToolsetVersionVs2013; | 271 toolset_version_ = kToolsetVersionVs2013; |
269 version_string_ = kVersionStringVs2013; | 272 version_string_ = kVersionStringVs2013; |
270 break; | 273 break; |
271 case Version::Vs2015: | 274 case Version::Vs2015: |
272 project_version_ = kProjectVersionVs2015; | 275 project_version_ = kProjectVersionVs2015; |
273 toolset_version_ = kToolsetVersionVs2015; | 276 toolset_version_ = kToolsetVersionVs2015; |
274 version_string_ = kVersionStringVs2015; | 277 version_string_ = kVersionStringVs2015; |
275 break; | 278 break; |
| 279 case Version::Vs2017: |
| 280 project_version_ = kProjectVersionVs2017; |
| 281 toolset_version_ = kToolsetVersionVs2017; |
| 282 version_string_ = kVersionStringVs2017; |
| 283 break; |
276 default: | 284 default: |
277 NOTREACHED() << "Not a valid Visual Studio Version: " << version; | 285 NOTREACHED() << "Not a valid Visual Studio Version: " << version; |
278 } | 286 } |
279 | 287 |
280 windows_kits_include_dirs_ = GetWindowsKitsIncludeDirs(); | 288 windows_kits_include_dirs_ = GetWindowsKitsIncludeDirs(); |
281 } | 289 } |
282 | 290 |
283 VisualStudioWriter::~VisualStudioWriter() { | 291 VisualStudioWriter::~VisualStudioWriter() { |
284 } | 292 } |
285 | 293 |
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
859 } | 867 } |
860 } | 868 } |
861 | 869 |
862 std::string VisualStudioWriter::GetNinjaTarget(const Target* target) { | 870 std::string VisualStudioWriter::GetNinjaTarget(const Target* target) { |
863 std::ostringstream ninja_target_out; | 871 std::ostringstream ninja_target_out; |
864 DCHECK(!target->dependency_output_file().value().empty()); | 872 DCHECK(!target->dependency_output_file().value().empty()); |
865 ninja_path_output_.WriteFile(ninja_target_out, | 873 ninja_path_output_.WriteFile(ninja_target_out, |
866 target->dependency_output_file()); | 874 target->dependency_output_file()); |
867 return ninja_target_out.str(); | 875 return ninja_target_out.str(); |
868 } | 876 } |
OLD | NEW |