| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 using System; | 4 using System; |
| 5 using System.Text; | 5 using System.Text; |
| 6 using System.Collections.Generic; | 6 using System.Collections.Generic; |
| 7 using EnvDTE; | 7 using EnvDTE; |
| 8 using EnvDTE80; | 8 using EnvDTE80; |
| 9 using Microsoft.VisualStudio.TestTools.UnitTesting; | 9 using Microsoft.VisualStudio.TestTools.UnitTesting; |
| 10 using Microsoft.VisualStudio.VCProjectEngine; | 10 using Microsoft.VisualStudio.VCProjectEngine; |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 | 99 |
| 100 /// <summary> | 100 /// <summary> |
| 101 /// Set the type of the project: Executable, DynamicLibrary, StaticLibra
ry | 101 /// Set the type of the project: Executable, DynamicLibrary, StaticLibra
ry |
| 102 /// </summary> | 102 /// </summary> |
| 103 private void SetProjectType(string projectType, string platformName) | 103 private void SetProjectType(string projectType, string platformName) |
| 104 { | 104 { |
| 105 Project project = dte_.Solution.Projects.Item(TestUtilities.NaClProj
ectUniqueName); | 105 Project project = dte_.Solution.Projects.Item(TestUtilities.NaClProj
ectUniqueName); |
| 106 TestUtilities.SetProjectType(project, projectType, platformName); | 106 TestUtilities.SetProjectType(project, projectType, platformName); |
| 107 } | 107 } |
| 108 | 108 |
| 109 protected void CheckCompile(string platform, bool dll) | 109 protected void CheckCompile(string platform) |
| 110 { | 110 { |
| 111 bool ppapi = platform == Strings.PepperPlatformName; |
| 111 dte_.Solution.Open(SolutionName_); | 112 dte_.Solution.Open(SolutionName_); |
| 112 SetProjectType("Executable", platform); | 113 if (!ppapi) |
| 113 TryCompile("Debug", platform); | 114 { |
| 114 TryCompile("Release", platform); | 115 // PPAPI host build are always either dll's or static libraries. |
| 116 SetProjectType("Application", platform); |
| 117 TryCompile("Debug", platform); |
| 118 TryCompile("Release", platform); |
| 119 } |
| 115 SetProjectType("StaticLibrary", platform); | 120 SetProjectType("StaticLibrary", platform); |
| 116 TryCompile("Debug", platform); | 121 TryCompile("Debug", platform); |
| 117 TryCompile("Release", platform); | 122 TryCompile("Release", platform); |
| 118 if (dll) | 123 if (ppapi) |
| 119 { | 124 { |
| 120 SetProjectType("DynamicLibrary", platform); | 125 SetProjectType("DynamicLibrary", platform); |
| 121 TryCompile("Debug", platform); | 126 TryCompile("Debug", platform); |
| 122 TryCompile("Release", platform); | 127 TryCompile("Release", platform); |
| 123 } | 128 } |
| 124 dte_.Solution.Close(true); | 129 dte_.Solution.Close(true); |
| 125 } | 130 } |
| 126 } | 131 } |
| 127 } | 132 } |
| OLD | NEW |