diff options
author | Rob Mensching <rob@firegiant.com> | 2017-12-26 17:33:06 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2017-12-26 17:33:06 -0800 |
commit | 9813f0b4054ab0c003529699d1a467db90395980 (patch) | |
tree | 07ef0d53cfebdb17d53ec146e1941a55f71e29f8 /src | |
parent | eee0773fc35c4c2d37c95186f4bf686dcb1c8d8b (diff) | |
download | wix-9813f0b4054ab0c003529699d1a467db90395980.tar.gz wix-9813f0b4054ab0c003529699d1a467db90395980.tar.bz2 wix-9813f0b4054ab0c003529699d1a467db90395980.zip |
Integrate rename of "Wixout" to "IntermediatePostLink"
Diffstat (limited to 'src')
-rw-r--r-- | src/WixToolset.Core/CommandLine/BuildCommand.cs | 2 | ||||
-rw-r--r-- | src/WixToolset.Core/CommandLine/CommandLineParser.cs | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs index b5ad0b0e..1731caaf 100644 --- a/src/WixToolset.Core/CommandLine/BuildCommand.cs +++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs | |||
@@ -92,7 +92,7 @@ namespace WixToolset.Core.CommandLine | |||
92 | 92 | ||
93 | library?.Save(this.OutputPath); | 93 | library?.Save(this.OutputPath); |
94 | } | 94 | } |
95 | else if (this.OutputType == OutputType.Wixout) | 95 | else if (this.OutputType == OutputType.IntermediatePostLink) |
96 | { | 96 | { |
97 | var output = this.LinkPhase(intermediates); | 97 | var output = this.LinkPhase(intermediates); |
98 | 98 | ||
diff --git a/src/WixToolset.Core/CommandLine/CommandLineParser.cs b/src/WixToolset.Core/CommandLine/CommandLineParser.cs index c5d3c03b..017810e0 100644 --- a/src/WixToolset.Core/CommandLine/CommandLineParser.cs +++ b/src/WixToolset.Core/CommandLine/CommandLineParser.cs | |||
@@ -250,6 +250,7 @@ namespace WixToolset.Core.CommandLine | |||
250 | return OutputType.PatchCreation; | 250 | return OutputType.PatchCreation; |
251 | 251 | ||
252 | case "product": | 252 | case "product": |
253 | case "package": | ||
253 | case ".msi": | 254 | case ".msi": |
254 | return OutputType.Product; | 255 | return OutputType.Product; |
255 | 256 | ||
@@ -257,9 +258,9 @@ namespace WixToolset.Core.CommandLine | |||
257 | case ".mst": | 258 | case ".mst": |
258 | return OutputType.Transform; | 259 | return OutputType.Transform; |
259 | 260 | ||
260 | case "wixout": | 261 | case "intermediatepostlink": |
261 | case ".wixout": | 262 | case ".wixipl": |
262 | return OutputType.Wixout; | 263 | return OutputType.IntermediatePostLink; |
263 | } | 264 | } |
264 | 265 | ||
265 | return OutputType.Unknown; | 266 | return OutputType.Unknown; |