diff options
author | Rob Mensching <rob@firegiant.com> | 2017-10-16 23:48:48 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2017-10-16 23:48:48 -0700 |
commit | 6dd045318f7ee405e92e76d311ad1424c20157c1 (patch) | |
tree | aef4f03fcad4990f22252956a57f62063f221722 /src/WixToolset.Core | |
parent | dbde9e7104b907bbbaea17e21247d8cafc8b3a4c (diff) | |
download | wix-6dd045318f7ee405e92e76d311ad1424c20157c1.tar.gz wix-6dd045318f7ee405e92e76d311ad1424c20157c1.tar.bz2 wix-6dd045318f7ee405e92e76d311ad1424c20157c1.zip |
Introduce integration test
Diffstat (limited to 'src/WixToolset.Core')
-rw-r--r-- | src/WixToolset.Core/CommandLine/BuildCommand.cs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs index 32da5bcf..b3909451 100644 --- a/src/WixToolset.Core/CommandLine/BuildCommand.cs +++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs | |||
@@ -70,6 +70,11 @@ namespace WixToolset.Core | |||
70 | { | 70 | { |
71 | var intermediates = this.CompilePhase(); | 71 | var intermediates = this.CompilePhase(); |
72 | 72 | ||
73 | if (!intermediates.Any()) | ||
74 | { | ||
75 | return 1; | ||
76 | } | ||
77 | |||
73 | var tableDefinitions = new TableDefinitionCollection(WindowsInstallerStandard.GetTableDefinitions()); | 78 | var tableDefinitions = new TableDefinitionCollection(WindowsInstallerStandard.GetTableDefinitions()); |
74 | 79 | ||
75 | if (this.OutputType == OutputType.Library) | 80 | if (this.OutputType == OutputType.Library) |
@@ -162,6 +167,12 @@ namespace WixToolset.Core | |||
162 | 167 | ||
163 | var resolver = CreateWixResolverWithVariables(localizer, output); | 168 | var resolver = CreateWixResolverWithVariables(localizer, output); |
164 | 169 | ||
170 | var intermediateFolder = this.IntermediateFolder; | ||
171 | if (String.IsNullOrEmpty(intermediateFolder)) | ||
172 | { | ||
173 | intermediateFolder = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()); | ||
174 | } | ||
175 | |||
165 | var context = new BindContext(); | 176 | var context = new BindContext(); |
166 | context.Messaging = Messaging.Instance; | 177 | context.Messaging = Messaging.Instance; |
167 | context.ExtensionManager = this.ExtensionManager; | 178 | context.ExtensionManager = this.ExtensionManager; |
@@ -171,7 +182,7 @@ namespace WixToolset.Core | |||
171 | context.Codepage = localizer.Codepage; | 182 | context.Codepage = localizer.Codepage; |
172 | //context.DefaultCompressionLevel = this.DefaultCompressionLevel; | 183 | //context.DefaultCompressionLevel = this.DefaultCompressionLevel; |
173 | //context.Ices = this.Ices; | 184 | //context.Ices = this.Ices; |
174 | context.IntermediateFolder = this.IntermediateFolder; | 185 | context.IntermediateFolder = intermediateFolder; |
175 | context.IntermediateRepresentation = output; | 186 | context.IntermediateRepresentation = output; |
176 | context.OutputPath = this.OutputPath; | 187 | context.OutputPath = this.OutputPath; |
177 | context.OutputPdbPath = Path.ChangeExtension(this.OutputPath, ".wixpdb"); | 188 | context.OutputPdbPath = Path.ChangeExtension(this.OutputPath, ".wixpdb"); |