diff options
Diffstat (limited to 'src/WixToolset.Core/CommandLine/BuildCommand.cs')
| -rw-r--r-- | src/WixToolset.Core/CommandLine/BuildCommand.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs index 16c98c83..76502bb0 100644 --- a/src/WixToolset.Core/CommandLine/BuildCommand.cs +++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs | |||
| @@ -13,7 +13,7 @@ namespace WixToolset.Core.CommandLine | |||
| 13 | 13 | ||
| 14 | internal class BuildCommand : ICommandLineCommand | 14 | internal class BuildCommand : ICommandLineCommand |
| 15 | { | 15 | { |
| 16 | public BuildCommand(IServiceProvider serviceProvider, IEnumerable<SourceFile> sources, IDictionary<string, string> preprocessorVariables, IEnumerable<string> locFiles, IEnumerable<string> libraryFiles, IEnumerable<string> filterCultures, string outputPath, OutputType outputType, string cabCachePath, bool bindFiles, IEnumerable<BindPath> bindPaths, IEnumerable<string> includeSearchPaths, string intermediateFolder, string contentsFile, string outputsFile, string builtOutputsFile) | 16 | public BuildCommand(IServiceProvider serviceProvider, IEnumerable<SourceFile> sources, IDictionary<string, string> preprocessorVariables, IEnumerable<string> locFiles, IEnumerable<string> libraryFiles, IEnumerable<string> filterCultures, string outputPath, OutputType outputType, Platform platform, string cabCachePath, bool bindFiles, IEnumerable<BindPath> bindPaths, IEnumerable<string> includeSearchPaths, string intermediateFolder, string contentsFile, string outputsFile, string builtOutputsFile) |
| 17 | { | 17 | { |
| 18 | this.ServiceProvider = serviceProvider; | 18 | this.ServiceProvider = serviceProvider; |
| 19 | this.Messaging = serviceProvider.GetService<IMessaging>(); | 19 | this.Messaging = serviceProvider.GetService<IMessaging>(); |
| @@ -25,6 +25,7 @@ namespace WixToolset.Core.CommandLine | |||
| 25 | this.SourceFiles = sources; | 25 | this.SourceFiles = sources; |
| 26 | this.OutputPath = outputPath; | 26 | this.OutputPath = outputPath; |
| 27 | this.OutputType = outputType; | 27 | this.OutputType = outputType; |
| 28 | this.Platform = platform; | ||
| 28 | 29 | ||
| 29 | this.CabCachePath = cabCachePath; | 30 | this.CabCachePath = cabCachePath; |
| 30 | this.BindFiles = bindFiles; | 31 | this.BindFiles = bindFiles; |
| @@ -59,6 +60,8 @@ namespace WixToolset.Core.CommandLine | |||
| 59 | 60 | ||
| 60 | private OutputType OutputType { get; } | 61 | private OutputType OutputType { get; } |
| 61 | 62 | ||
| 63 | private Platform Platform { get; } | ||
| 64 | |||
| 62 | public string CabCachePath { get; } | 65 | public string CabCachePath { get; } |
| 63 | 66 | ||
| 64 | public bool BindFiles { get; } | 67 | public bool BindFiles { get; } |
| @@ -171,7 +174,7 @@ namespace WixToolset.Core.CommandLine | |||
| 171 | { | 174 | { |
| 172 | var preprocessor = new Preprocessor(this.ServiceProvider); | 175 | var preprocessor = new Preprocessor(this.ServiceProvider); |
| 173 | preprocessor.IncludeSearchPaths = this.IncludeSearchPaths; | 176 | preprocessor.IncludeSearchPaths = this.IncludeSearchPaths; |
| 174 | preprocessor.Platform = Platform.X86; // TODO: set this correctly | 177 | preprocessor.Platform = this.Platform; |
| 175 | preprocessor.SourcePath = sourceFile.SourcePath; | 178 | preprocessor.SourcePath = sourceFile.SourcePath; |
| 176 | preprocessor.Variables = this.PreprocessorVariables; | 179 | preprocessor.Variables = this.PreprocessorVariables; |
| 177 | 180 | ||
| @@ -192,7 +195,7 @@ namespace WixToolset.Core.CommandLine | |||
| 192 | 195 | ||
| 193 | var compiler = new Compiler(this.ServiceProvider); | 196 | var compiler = new Compiler(this.ServiceProvider); |
| 194 | compiler.OutputPath = sourceFile.OutputPath; | 197 | compiler.OutputPath = sourceFile.OutputPath; |
| 195 | compiler.Platform = Platform.X86; // TODO: set this correctly | 198 | compiler.Platform = this.Platform; |
| 196 | compiler.SourceDocument = document; | 199 | compiler.SourceDocument = document; |
| 197 | var intermediate = compiler.Execute(); | 200 | var intermediate = compiler.Execute(); |
| 198 | 201 | ||
