diff options
| author | Rob Mensching <rob@firegiant.com> | 2017-11-01 10:59:45 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2017-11-01 10:59:45 -0700 |
| commit | 2bb37beda887d120a0ddabf874ad25357101faa1 (patch) | |
| tree | c35e97b03274b86cfc9ff7fd2caeee211165a140 /src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs | |
| parent | df7413aeed3aea3425dff20ae0c8b1be3a3ab525 (diff) | |
| download | wix-2bb37beda887d120a0ddabf874ad25357101faa1.tar.gz wix-2bb37beda887d120a0ddabf874ad25357101faa1.tar.bz2 wix-2bb37beda887d120a0ddabf874ad25357101faa1.zip | |
Update to WiX Intermediate Representation
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs index 21fbb022..5a61b63c 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs | |||
| @@ -39,7 +39,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 39 | this.DelayedFields = context.DelayedFields; | 39 | this.DelayedFields = context.DelayedFields; |
| 40 | this.ExpectedEmbeddedFiles = context.ExpectedEmbeddedFiles; | 40 | this.ExpectedEmbeddedFiles = context.ExpectedEmbeddedFiles; |
| 41 | this.Extensions = context.Extensions; | 41 | this.Extensions = context.Extensions; |
| 42 | this.Output = context.IntermediateRepresentation; | 42 | this.Intermediate = context.IntermediateRepresentation; |
| 43 | this.OutputPath = context.OutputPath; | 43 | this.OutputPath = context.OutputPath; |
| 44 | this.PdbFile = context.OutputPdbPath; | 44 | this.PdbFile = context.OutputPdbPath; |
| 45 | this.IntermediateFolder = context.IntermediateFolder; | 45 | this.IntermediateFolder = context.IntermediateFolder; |
| @@ -69,10 +69,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 69 | 69 | ||
| 70 | private IEnumerable<IBinderExtension> Extensions { get; } | 70 | private IEnumerable<IBinderExtension> Extensions { get; } |
| 71 | 71 | ||
| 72 | private IEnumerable<InspectorExtension> InspectorExtensions { get; } | ||
| 73 | |||
| 74 | private string PdbFile { get; } | 72 | private string PdbFile { get; } |
| 75 | 73 | ||
| 74 | private Intermediate Intermediate { get; } | ||
| 75 | |||
| 76 | private Output Output { get; } | 76 | private Output Output { get; } |
| 77 | 77 | ||
| 78 | private string OutputPath { get; } | 78 | private string OutputPath { get; } |
| @@ -95,6 +95,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 95 | 95 | ||
| 96 | public void Execute() | 96 | public void Execute() |
| 97 | { | 97 | { |
| 98 | this.Intermediate.Save(this.OutputPath); | ||
| 99 | #if FINISH | ||
| 98 | List<FileTransfer> fileTransfers = new List<FileTransfer>(); | 100 | List<FileTransfer> fileTransfers = new List<FileTransfer>(); |
| 99 | 101 | ||
| 100 | HashSet<string> suppressedTableNames = new HashSet<string>(); | 102 | HashSet<string> suppressedTableNames = new HashSet<string>(); |
| @@ -108,6 +110,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 108 | 110 | ||
| 109 | this.LocalizeUI(this.Output.Tables); | 111 | this.LocalizeUI(this.Output.Tables); |
| 110 | 112 | ||
| 113 | this.Output = CreateOutputFromIR(this.Intermediate); | ||
| 114 | |||
| 111 | // Process the summary information table before the other tables. | 115 | // Process the summary information table before the other tables. |
| 112 | bool compressed; | 116 | bool compressed; |
| 113 | bool longNames; | 117 | bool longNames; |
| @@ -1278,6 +1282,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 1278 | command.TempFilesLocation = this.IntermediateFolder; | 1282 | command.TempFilesLocation = this.IntermediateFolder; |
| 1279 | command.Codepage = this.Codepage; | 1283 | command.Codepage = this.Codepage; |
| 1280 | command.Execute(); | 1284 | command.Execute(); |
| 1285 | #endif | ||
| 1281 | } | 1286 | } |
| 1282 | } | 1287 | } |
| 1283 | } | 1288 | } |
