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

Flow the intermediate output path to project refs

Browse source
This commit is contained in:
David Fowler 2015-11-01 05:50:39 -08:00
parent b5ebe855ad
commit 27f8300e82
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/Microsoft.DotNet.Tools.Compiler/Program.cs
View file

@ -25,6 +25,7 @@ namespace Microsoft.DotNet.Tools.Compiler
app.HelpOption("-h|--help"); app.HelpOption("-h|--help");
var output = app.Option("-o|--output <OUTPUT_DIR>", "Directory in which to place outputs", CommandOptionType.SingleValue); var output = app.Option("-o|--output <OUTPUT_DIR>", "Directory in which to place outputs", CommandOptionType.SingleValue);
var intermediateOutput = app.Option("-t|--temp-output <OUTPUT_DIR>", "Directory in which to place temporary outputs", CommandOptionType.SingleValue);
var framework = app.Option("-f|--framework <FRAMEWORK>", "Compile a specific framework", CommandOptionType.MultipleValue); var framework = app.Option("-f|--framework <FRAMEWORK>", "Compile a specific framework", CommandOptionType.MultipleValue);
var configuration = app.Option("-c|--configuration <CONFIGURATION>", "Configuration under which to build", CommandOptionType.SingleValue); var configuration = app.Option("-c|--configuration <CONFIGURATION>", "Configuration under which to build", CommandOptionType.SingleValue);
var noProjectDependencies = app.Option("--no-project-dependencies", "Skips building project references.", CommandOptionType.NoValue); var noProjectDependencies = app.Option("--no-project-dependencies", "Skips building project references.", CommandOptionType.NoValue);
@ -49,7 +50,7 @@ namespace Microsoft.DotNet.Tools.Compiler
{ {
foreach (var context in framework.Values.Select(f => ProjectContext.Create(path, NuGetFramework.Parse(f)))) foreach (var context in framework.Values.Select(f => ProjectContext.Create(path, NuGetFramework.Parse(f))))
{ {
success &= Compile(context, configuration.Value() ?? Constants.DefaultConfiguration, output.Value(), buildProjectReferences); success &= Compile(context, configuration.Value() ?? Constants.DefaultConfiguration, output.Value(), intermediateOutput.Value(), buildProjectReferences);
if (isNative) if (isNative)
{ {
@ -61,7 +62,7 @@ namespace Microsoft.DotNet.Tools.Compiler
{ {
foreach (var context in ProjectContext.CreateContextForEachFramework(path)) foreach (var context in ProjectContext.CreateContextForEachFramework(path))
{ {
success &= Compile(context, configuration.Value() ?? Constants.DefaultConfiguration, output.Value(), buildProjectReferences); success &= Compile(context, configuration.Value() ?? Constants.DefaultConfiguration, output.Value(), intermediateOutput.Value(), buildProjectReferences);
if (isNative) if (isNative)
{ {
@ -103,13 +104,13 @@ namespace Microsoft.DotNet.Tools.Compiler
return result.ExitCode == 0; return result.ExitCode == 0;
} }
private static bool Compile(ProjectContext context, string configuration, string outputOptionValue, bool buildProjectReferences) private static bool Compile(ProjectContext context, string configuration, string outputOptionValue, string intermediateOutputValue, bool buildProjectReferences)
{ {
Reporter.Output.WriteLine($"Compiling {context.RootProject.Identity.Name.Yellow()} for {context.TargetFramework.DotNetFrameworkName.Yellow()}"); Reporter.Output.WriteLine($"Compiling {context.RootProject.Identity.Name.Yellow()} for {context.TargetFramework.DotNetFrameworkName.Yellow()}");
// Set up Output Paths // Set up Output Paths
string outputPath = GetOutputPath(context, configuration, outputOptionValue); string outputPath = GetOutputPath(context, configuration, outputOptionValue);
string intermediateOutputPath = GetIntermediateOutputPath(context, configuration, outputOptionValue); string intermediateOutputPath = GetIntermediateOutputPath(context, configuration, intermediateOutputValue, outputOptionValue);
Directory.CreateDirectory(outputPath); Directory.CreateDirectory(outputPath);
Directory.CreateDirectory(intermediateOutputPath); Directory.CreateDirectory(intermediateOutputPath);
@ -143,7 +144,7 @@ namespace Microsoft.DotNet.Tools.Compiler
foreach (var projectDependency in Sort(projects)) foreach (var projectDependency in Sort(projects))
{ {
// Skip compiling project dependencies since we've already figured out the build order // Skip compiling project dependencies since we've already figured out the build order
var compileResult = Command.Create("dotnet-compile", $"--framework {projectDependency.Framework} --configuration {configuration} --output \"{outputPath}\" --no-project-dependencies \"{projectDependency.Project.ProjectDirectory}\"") var compileResult = Command.Create("dotnet-compile", $"--framework {projectDependency.Framework} --configuration {configuration} --output \"{outputPath}\" --temp-output \"{intermediateOutputPath}\" --no-project-dependencies \"{projectDependency.Project.ProjectDirectory}\"")
.ForwardStdOut() .ForwardStdOut()
.ForwardStdErr() .ForwardStdErr()
.Execute(); .Execute();
@ -298,11 +299,11 @@ namespace Microsoft.DotNet.Tools.Compiler
return outputPath; return outputPath;
} }
private static string GetIntermediateOutputPath(ProjectContext context, string configuration, string outputOptionValue) private static string GetIntermediateOutputPath(ProjectContext context, string configuration, string intermediateOutputValue, string outputOptionValue)
{ {
var intermediateOutputPath = string.Empty; var intermediateOutputPath = string.Empty;
if (string.IsNullOrEmpty(outputOptionValue)) if (string.IsNullOrEmpty(intermediateOutputValue))
{ {
intermediateOutputPath = Path.Combine( intermediateOutputPath = Path.Combine(
GetDefaultRootOutputPath(context, outputOptionValue), GetDefaultRootOutputPath(context, outputOptionValue),
@ -312,7 +313,7 @@ namespace Microsoft.DotNet.Tools.Compiler
} }
else else
{ {
intermediateOutputPath = outputOptionValue; intermediateOutputPath = intermediateOutputValue;
} }
return intermediateOutputPath; return intermediateOutputPath;