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

Include project.json dependencies for native

Browse source
This commit is contained in:
Senthil 2016-02-03 16:34:03 -08:00 • committed by schellap
commit ef00f0331e
15 changed files with 98 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/dotnet/commands/dotnet-compile-native/ArgumentsParser.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.CommandLine;
using System.Linq;
namespace Microsoft.DotNet.Tools.Compiler.Native
{
@ -15,7 +16,8 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
BuildConfiguration? buildConfiguration = null;
string mode = null;
NativeIntermediateMode? nativeMode = null;
string ilcArgs = null;
IReadOnlyList<string> ilcArgs = Array.Empty<string>();
IEnumerable<string> unquotIlcArgs = Array.Empty<string>();
string ilcPath = null;
string ilcSdkPath = null;
string appDepSdk = null;
@ -26,7 +28,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
string cppCompilerFlags = null;
IReadOnlyList<string> references = Array.Empty<string>();
IReadOnlyList<string> linklib = Array.Empty<string>();
IReadOnlyList<string> linklib = Array.Empty<string>();
try
{
@ -46,7 +48,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
"Use to specify Managed DLL references of the app.");
// Custom Extensibility Points to support CoreRT workflow TODO better descriptions
syntax.DefineOption("ilcargs", ref ilcArgs, "Use to specify custom arguments for the IL Compiler.");
syntax.DefineOptionList("ilcarg", ref ilcArgs, "Use to specify custom arguments for the IL Compiler.");
syntax.DefineOption("ilcpath", ref ilcPath, "Use to specify a custom build of IL Compiler.");
syntax.DefineOption("ilcsdkpath", ref ilcSdkPath, "Use to specify a custom build of IL Compiler SDK");
@ -67,7 +69,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
"The managed input assembly to compile to native.");
helpText = syntax.GetHelpText();
if (string.IsNullOrWhiteSpace(inputAssembly))
{
syntax.ReportError("Input Assembly is a required parameter.");
@ -99,6 +101,15 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
help = true;
}
}
unquotIlcArgs = ilcArgs.Select(s =>
{
if (!s.StartsWith("\"") || !s.EndsWith("\""))
{
throw new ArgumentSyntaxException("--ilcarg must be specified in double quotes");
}
return s.Substring(1, s.Length - 2);
});
});
}
catch (ArgumentSyntaxException exception)
@ -130,7 +141,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
BuildConfiguration = buildConfiguration,
NativeMode = nativeMode,
ReferencePaths = references,
IlcArgs = ilcArgs,
IlcArgs = unquotIlcArgs,
IlcPath = ilcPath,
IlcSdkPath = ilcSdkPath,
LinkLibPaths = linklib,