diff options
| author | Rob Mensching <rob@firegiant.com> | 2017-12-27 22:58:19 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2017-12-27 22:58:19 -0800 |
| commit | 58b8be53fd966e3d475362912477a422f5b5aa11 (patch) | |
| tree | d6bb3edd0d4e7344777de802b32151f35987884a /src/WixToolset.Core.WindowsInstaller/Bind/ModularizeCommand.cs | |
| parent | fe7112d862cab6ba28ee40e5539de8e297e0bbf2 (diff) | |
| download | wix-58b8be53fd966e3d475362912477a422f5b5aa11.tar.gz wix-58b8be53fd966e3d475362912477a422f5b5aa11.tar.bz2 wix-58b8be53fd966e3d475362912477a422f5b5aa11.zip | |
Correctly join command line arguments and other small clean up and optimizations
Diffstat (limited to '')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/ModularizeCommand.cs (renamed from src/WixToolset.Core.WindowsInstaller/Bind/ModularaizeCommand.cs) | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ModularaizeCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ModularizeCommand.cs index 8c6e3831..ba6af986 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/ModularaizeCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/ModularizeCommand.cs | |||
| @@ -13,9 +13,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 13 | using WixToolset.Data.Tuples; | 13 | using WixToolset.Data.Tuples; |
| 14 | using WixToolset.Data.WindowsInstaller; | 14 | using WixToolset.Data.WindowsInstaller; |
| 15 | 15 | ||
| 16 | internal class ModularaizeCommand | 16 | internal class ModularizeCommand |
| 17 | { | 17 | { |
| 18 | public ModularaizeCommand(Output output, string modularizationGuid, IEnumerable<WixSuppressModularizationTuple> suppressTuples) | 18 | public ModularizeCommand(Output output, string modularizationGuid, IEnumerable<WixSuppressModularizationTuple> suppressTuples) |
| 19 | { | 19 | { |
| 20 | this.Output = output; | 20 | this.Output = output; |
| 21 | this.ModularizationGuid = modularizationGuid; | 21 | this.ModularizationGuid = modularizationGuid; |
| @@ -38,12 +38,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 38 | } | 38 | } |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | /// <summary> | 41 | private void ModularizeTable(Table table) |
| 42 | /// Modularize the table. | ||
| 43 | /// </summary> | ||
| 44 | /// <param name="modularizationGuid">String containing the GUID of the Merge Module, if appropriate.</param> | ||
| 45 | /// <param name="suppressModularizationIdentifiers">Optional collection of identifiers that should not be modularized.</param> | ||
| 46 | public void ModularizeTable(Table table) | ||
| 47 | { | 42 | { |
| 48 | var modularizedColumns = new List<int>(); | 43 | var modularizedColumns = new List<int>(); |
| 49 | 44 | ||
| @@ -79,7 +74,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 79 | 74 | ||
| 80 | if (!(WindowsInstallerStandard.IsStandardAction(fieldData) || WindowsInstallerStandard.IsStandardProperty(fieldData))) | 75 | if (!(WindowsInstallerStandard.IsStandardAction(fieldData) || WindowsInstallerStandard.IsStandardProperty(fieldData))) |
| 81 | { | 76 | { |
| 82 | ColumnModularizeType modularizeType = field.Column.ModularizeType; | 77 | var modularizeType = field.Column.ModularizeType; |
| 83 | 78 | ||
| 84 | // special logic for the ControlEvent table's Argument column | 79 | // special logic for the ControlEvent table's Argument column |
| 85 | // this column requires different modularization methods depending upon the value of the Event column | 80 | // this column requires different modularization methods depending upon the value of the Event column |
