mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Code Review Feedback

Browse source
This commit is contained in:
Bryan 2015-11-17 19:50:19 -08:00
parent fd471025dc
commit 5db8ae5e6d
14 changed files with 192 additions and 320 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsCppCompileStep.cs
View file

@ -27,13 +27,16 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
};
private string CompilerArgStr { get; set; }
private NativeCompileSettings config;
public WindowsCppCompileStep(NativeCompileSettings config)
{
this.config = config;
InitializeArgs(config);
}
public int Invoke(NativeCompileSettings config)
public int Invoke()
{
var result = WindowsCommon.SetVCVars();
if (result != 0)
@ -42,7 +45,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
return result;
}
result = InvokeCompiler(config);
result = InvokeCompiler();
if (result != 0)
{
Reporter.Error.WriteLine("Compilation of intermediate files failed.");
@ -85,7 +88,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
this.CompilerArgStr = string.Join(" ", argsList);
}
private int InvokeCompiler(NativeCompileSettings config)
private int InvokeCompiler()
{
var vcInstallDir = Environment.GetEnvironmentVariable("VS140COMNTOOLS");
var compilerPath = Path.Combine(vcInstallDir, VSBin, CompilerName);