diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-05-10 09:07:42 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-05-10 14:03:30 +1000 |
| commit | a75639ceaffcf5f56fa33094037bca86331d9ac0 (patch) | |
| tree | d34b808eeae67744d6f3065c4eba6ec5c5780644 /src/WixToolset.Core/CommandLine/BuildCommand.cs | |
| parent | a74cbd658fb7bf904275ed5f27a7b15bedc18435 (diff) | |
| download | wix-a75639ceaffcf5f56fa33094037bca86331d9ac0.tar.gz wix-a75639ceaffcf5f56fa33094037bca86331d9ac0.tar.bz2 wix-a75639ceaffcf5f56fa33094037bca86331d9ac0.zip | |
Use WixToolset.Burn package to get rid of -burnStubPath.
Stop using x86 stub for x64.
Diffstat (limited to 'src/WixToolset.Core/CommandLine/BuildCommand.cs')
| -rw-r--r-- | src/WixToolset.Core/CommandLine/BuildCommand.cs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs index dbdad0a9..80003392 100644 --- a/src/WixToolset.Core/CommandLine/BuildCommand.cs +++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs | |||
| @@ -157,7 +157,7 @@ namespace WixToolset.Core.CommandLine | |||
| 157 | { | 157 | { |
| 158 | using (new IntermediateFieldContext("wix.bind")) | 158 | using (new IntermediateFieldContext("wix.bind")) |
| 159 | { | 159 | { |
| 160 | this.BindPhase(wixipl, wxls, filterCultures, this.commandLine.CabCachePath, this.commandLine.BindPaths, this.commandLine.BurnStubPath); | 160 | this.BindPhase(wixipl, wxls, filterCultures, this.commandLine.CabCachePath, this.commandLine.BindPaths); |
| 161 | } | 161 | } |
| 162 | } | 162 | } |
| 163 | } | 163 | } |
| @@ -294,7 +294,7 @@ namespace WixToolset.Core.CommandLine | |||
| 294 | return linker.Link(context); | 294 | return linker.Link(context); |
| 295 | } | 295 | } |
| 296 | 296 | ||
| 297 | private void BindPhase(Intermediate output, IEnumerable<Localization> localizations, IEnumerable<string> filterCultures, string cabCachePath, IEnumerable<IBindPath> bindPaths, string burnStubPath) | 297 | private void BindPhase(Intermediate output, IEnumerable<Localization> localizations, IEnumerable<string> filterCultures, string cabCachePath, IEnumerable<IBindPath> bindPaths) |
| 298 | { | 298 | { |
| 299 | var intermediateFolder = this.IntermediateFolder; | 299 | var intermediateFolder = this.IntermediateFolder; |
| 300 | if (String.IsNullOrEmpty(intermediateFolder)) | 300 | if (String.IsNullOrEmpty(intermediateFolder)) |
| @@ -328,7 +328,6 @@ namespace WixToolset.Core.CommandLine | |||
| 328 | { | 328 | { |
| 329 | var context = this.ServiceProvider.GetService<IBindContext>(); | 329 | var context = this.ServiceProvider.GetService<IBindContext>(); |
| 330 | //context.CabbingThreadCount = this.CabbingThreadCount; | 330 | //context.CabbingThreadCount = this.CabbingThreadCount; |
| 331 | context.BurnStubPath = burnStubPath; | ||
| 332 | context.CabCachePath = cabCachePath; | 331 | context.CabCachePath = cabCachePath; |
| 333 | context.Codepage = resolveResult.Codepage; | 332 | context.Codepage = resolveResult.Codepage; |
| 334 | //context.DefaultCompressionLevel = this.DefaultCompressionLevel; | 333 | //context.DefaultCompressionLevel = this.DefaultCompressionLevel; |
| @@ -491,8 +490,6 @@ namespace WixToolset.Core.CommandLine | |||
| 491 | 490 | ||
| 492 | public List<IBindPath> BindPaths { get; } = new List<IBindPath>(); | 491 | public List<IBindPath> BindPaths { get; } = new List<IBindPath>(); |
| 493 | 492 | ||
| 494 | public string BurnStubPath { get; private set; } | ||
| 495 | |||
| 496 | public string CabCachePath { get; private set; } | 493 | public string CabCachePath { get; private set; } |
| 497 | 494 | ||
| 498 | public List<string> Cultures { get; } = new List<string>(); | 495 | public List<string> Cultures { get; } = new List<string>(); |
| @@ -579,9 +576,6 @@ namespace WixToolset.Core.CommandLine | |||
| 579 | } | 576 | } |
| 580 | break; | 577 | break; |
| 581 | } | 578 | } |
| 582 | case "burnstub": | ||
| 583 | this.BurnStubPath = parser.GetNextArgumentOrError(arg); | ||
| 584 | return true; | ||
| 585 | 579 | ||
| 586 | case "cc": | 580 | case "cc": |
| 587 | this.CabCachePath = parser.GetNextArgumentOrError(arg); | 581 | this.CabCachePath = parser.GetNextArgumentOrError(arg); |
