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

Merge pull request #665 from gkhanna79/FixILCSDK

Browse source 
Fix the trimming of terminating slashes when computing ILCSDKPath
This commit is contained in:
Gaurav Khanna 2015-12-29 20:44:03 -08:00
commit f1d9503a6e
5 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Microsoft.DotNet.Tools.Compiler.Native/ArgValues.cs
View file

@ -65,6 +65,11 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
config.IlcSdkPath = IlcSdkPath;
}
// Get the directory name to ensure there are no trailing slashes as they may conflict
// with the terminating " we suffix to account for paths with spaces in them.
char[] charsToTrim = {'\\', '/'};
config.IlcSdkPath = config.IlcSdkPath.TrimEnd(charsToTrim);
if (!string.IsNullOrEmpty(LogPath))
{
config.LogPath = LogPath;

5
src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Linux/LinuxCppCompileStep.cs
View file

@ -67,10 +67,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
// TODO: Enable this when https://github.com/dotnet/cli/pull/469 goes through.
// var ilcSdkIncPath = Path.Combine(config.IlcSdkPath, "inc");
//
// Get the directory name to ensure there are no trailing slashes as they may conflict
// with the terminating " we suffix to account for paths with spaces in them.
var ilcSdkIncPath = Path.GetDirectoryName(config.IlcSdkPath);
var ilcSdkIncPath = config.IlcSdkPath;
argsList.Add("-I");
argsList.Add($"\"{ilcSdkIncPath}\"");

3
src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Linux/LinuxRyuJitCompileStep.cs
View file

@ -95,9 +95,6 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
var libOut = DetermineOutputFile(config);
argsList.Add($"-o \"{libOut}\"");
// Add Stubs
argsList.Add(Path.Combine(config.AppDepSDKPath, "CPPSdk/ubuntu.14.04/lxstubs.cpp"));
this.CompilerArgStr = string.Join(" ", argsList);
}

5
src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Mac/MacCppCompileStep.cs
View file

@ -69,10 +69,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
// TODO: Enable this when https://github.com/dotnet/cli/pull/469 goes through.
// var ilcSdkIncPath = Path.Combine(config.IlcSdkPath, "inc");
//
// Get the directory name to ensure there are no trailing slashes as they may conflict
// with the terminating " we suffix to account for paths with spaces in them.
var ilcSdkIncPath = Path.GetDirectoryName(config.IlcSdkPath);
var ilcSdkIncPath = config.IlcSdkPath;
argsList.Add("-I");
argsList.Add($"\"{ilcSdkIncPath}\"");

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

@ -71,11 +71,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
//
// TODO: Enable this when https://github.com/dotnet/cli/pull/469 goes through.
// var ilcSdkIncPath = Path.Combine(config.IlcSdkPath, "inc");
//
// Get the directory name to ensure there are no trailing slashes as they may conflict
// with the terminating " we suffix to account for paths with spaces in them.
var ilcSdkIncPath = config.IlcSdkPath;
ilcSdkIncPath = ilcSdkIncPath.TrimEnd(new char[] {'\\'});
argsList.Add("/I");
argsList.Add($"\"{ilcSdkIncPath}\"");