diff options
| author | Bob Arnson <bob@firegiant.com> | 2021-01-26 11:39:56 -0500 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2021-01-26 11:46:20 -0500 |
| commit | 870d523687cbeeab3432abdb5a07a5250c5e1bc4 (patch) | |
| tree | 6a1a69e6ddaea1c0dfa3ec4b49534cd856f2ecc9 /src/WixToolset.Core/CommandLine/BuildCommand.cs | |
| parent | 0741acf89631bf226acb2d226981f0de0065c1f1 (diff) | |
| download | wix-870d523687cbeeab3432abdb5a07a5250c5e1bc4.tar.gz wix-870d523687cbeeab3432abdb5a07a5250c5e1bc4.tar.bz2 wix-870d523687cbeeab3432abdb5a07a5250c5e1bc4.zip | |
Add DefaultCompressionLevel support.
Diffstat (limited to 'src/WixToolset.Core/CommandLine/BuildCommand.cs')
| -rw-r--r-- | src/WixToolset.Core/CommandLine/BuildCommand.cs | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs index 065467bd..2216a80f 100644 --- a/src/WixToolset.Core/CommandLine/BuildCommand.cs +++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs | |||
| @@ -50,6 +50,8 @@ namespace WixToolset.Core.CommandLine | |||
| 50 | 50 | ||
| 51 | private string OutputFile { get; set; } | 51 | private string OutputFile { get; set; } |
| 52 | 52 | ||
| 53 | private CompressionLevel? DefaultCompressionLevel { get; set; } | ||
| 54 | |||
| 53 | private string ContentsFile { get; set; } | 55 | private string ContentsFile { get; set; } |
| 54 | 56 | ||
| 55 | private string OutputsFile { get; set; } | 57 | private string OutputsFile { get; set; } |
| @@ -82,6 +84,8 @@ namespace WixToolset.Core.CommandLine | |||
| 82 | 84 | ||
| 83 | this.BuiltOutputsFile = this.commandLine.BuiltOutputsFile; | 85 | this.BuiltOutputsFile = this.commandLine.BuiltOutputsFile; |
| 84 | 86 | ||
| 87 | this.DefaultCompressionLevel = this.commandLine.DefaultCompressionLevel; | ||
| 88 | |||
| 85 | var preprocessorVariables = this.commandLine.GatherPreprocessorVariables(); | 89 | var preprocessorVariables = this.commandLine.GatherPreprocessorVariables(); |
| 86 | 90 | ||
| 87 | var sourceFiles = this.commandLine.GatherSourceFiles(this.IntermediateFolder); | 91 | var sourceFiles = this.commandLine.GatherSourceFiles(this.IntermediateFolder); |
| @@ -335,7 +339,7 @@ namespace WixToolset.Core.CommandLine | |||
| 335 | //context.CabbingThreadCount = this.CabbingThreadCount; | 339 | //context.CabbingThreadCount = this.CabbingThreadCount; |
| 336 | context.CabCachePath = cabCachePath; | 340 | context.CabCachePath = cabCachePath; |
| 337 | context.Codepage = resolveResult.Codepage; | 341 | context.Codepage = resolveResult.Codepage; |
| 338 | //context.DefaultCompressionLevel = this.DefaultCompressionLevel; | 342 | context.DefaultCompressionLevel = this.DefaultCompressionLevel; |
| 339 | context.DelayedFields = resolveResult.DelayedFields; | 343 | context.DelayedFields = resolveResult.DelayedFields; |
| 340 | context.ExpectedEmbeddedFiles = resolveResult.ExpectedEmbeddedFiles; | 344 | context.ExpectedEmbeddedFiles = resolveResult.ExpectedEmbeddedFiles; |
| 341 | context.Extensions = this.ExtensionManager.GetServices<IBinderExtension>(); | 345 | context.Extensions = this.ExtensionManager.GetServices<IBinderExtension>(); |
| @@ -529,6 +533,8 @@ namespace WixToolset.Core.CommandLine | |||
| 529 | 533 | ||
| 530 | public string OutputType { get; private set; } | 534 | public string OutputType { get; private set; } |
| 531 | 535 | ||
| 536 | public CompressionLevel? DefaultCompressionLevel { get; private set; } | ||
| 537 | |||
| 532 | public string ContentsFile { get; private set; } | 538 | public string ContentsFile { get; private set; } |
| 533 | 539 | ||
| 534 | public string OutputsFile { get; private set; } | 540 | public string OutputsFile { get; private set; } |
| @@ -611,6 +617,18 @@ namespace WixToolset.Core.CommandLine | |||
| 611 | parser.GetNextArgumentOrError(arg, this.Defines); | 617 | parser.GetNextArgumentOrError(arg, this.Defines); |
| 612 | return true; | 618 | return true; |
| 613 | 619 | ||
| 620 | case "dcl": | ||
| 621 | case "defaultcompressionlevel": | ||
| 622 | { | ||
| 623 | var value = parser.GetNextArgumentOrError(arg); | ||
| 624 | if (Enum.TryParse(value, true, out CompressionLevel compressionLevel)) | ||
| 625 | { | ||
| 626 | this.DefaultCompressionLevel = compressionLevel; | ||
| 627 | return true; | ||
| 628 | } | ||
| 629 | return false; | ||
| 630 | } | ||
| 631 | |||
| 614 | case "i": | 632 | case "i": |
| 615 | case "includepath": | 633 | case "includepath": |
| 616 | parser.GetNextArgumentOrError(arg, this.IncludeSearchPaths); | 634 | parser.GetNextArgumentOrError(arg, this.IncludeSearchPaths); |
