aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2018-07-31 15:28:24 -0700
committerRob Mensching <rob@firegiant.com>2018-07-31 15:28:24 -0700
commit647843e5c749c8cdabad423a33197056ed1fb1d0 (patch)
tree2e35fb8cbc59ff5c3561aefcdef0657f33a2541c
parent448064034d09629d3b552d2406c8cb5e3a27097d (diff)
downloadwix-647843e5c749c8cdabad423a33197056ed1fb1d0.tar.gz
wix-647843e5c749c8cdabad423a33197056ed1fb1d0.tar.bz2
wix-647843e5c749c8cdabad423a33197056ed1fb1d0.zip
Add error messages for source file command line processing
-rw-r--r--src/WixToolset.Data/ErrorMessages.cs13
-rw-r--r--src/WixToolset.Data/FileStructure.cs1
2 files changed, 13 insertions, 1 deletions
diff --git a/src/WixToolset.Data/ErrorMessages.cs b/src/WixToolset.Data/ErrorMessages.cs
index a50615f3..9b59d6b9 100644
--- a/src/WixToolset.Data/ErrorMessages.cs
+++ b/src/WixToolset.Data/ErrorMessages.cs
@@ -3,7 +3,6 @@
3namespace WixToolset.Data 3namespace WixToolset.Data
4{ 4{
5 using System; 5 using System;
6 using System.Collections;
7 using System.Collections.Generic; 6 using System.Collections.Generic;
8 using System.Resources; 7 using System.Resources;
9 8
@@ -2225,6 +2224,16 @@ namespace WixToolset.Data
2225 return Message(null, Ids.WrongFileExtensionForNumberOfInputs, "The extension '{0}' on the input specified '{1}' does not match the number of inputs required to handle an input with this extension. Check if you are missing an input or have too many.", inputExtension, input); 2224 return Message(null, Ids.WrongFileExtensionForNumberOfInputs, "The extension '{0}' on the input specified '{1}' does not match the number of inputs required to handle an input with this extension. Check if you are missing an input or have too many.", inputExtension, input);
2226 } 2225 }
2227 2226
2227 public static Message NoSourceFiles()
2228 {
2229 return Message(null, Ids.NoSourceFiles, "No source files specified.");
2230 }
2231
2232 public static Message WixiplSourceFileIsExclusive()
2233 {
2234 return Message(null, Ids.WixiplSourceFileIsExclusive, "When an intermediate post link source file is specified, it must be the only source file provided.");
2235 }
2236
2228 private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) 2237 private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
2229 { 2238 {
2230 return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args); 2239 return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args);
@@ -2618,6 +2627,8 @@ namespace WixToolset.Data
2618 InsecureBundleFilename = 388, 2627 InsecureBundleFilename = 388,
2619 PayloadMustBeRelativeToCache = 389, 2628 PayloadMustBeRelativeToCache = 389,
2620 MsiTransactionX86BeforeX64 = 390, 2629 MsiTransactionX86BeforeX64 = 390,
2630 NoSourceFiles = 391,
2631 WixiplSourceFileIsExclusive = 392,
2621 } 2632 }
2622 } 2633 }
2623} 2634}
diff --git a/src/WixToolset.Data/FileStructure.cs b/src/WixToolset.Data/FileStructure.cs
index 722125d8..2667df1e 100644
--- a/src/WixToolset.Data/FileStructure.cs
+++ b/src/WixToolset.Data/FileStructure.cs
@@ -23,6 +23,7 @@ namespace WixToolset.Data
23 { 23 {
24 { "wir", FileFormat.WixIR }, 24 { "wir", FileFormat.WixIR },
25 { "wixirf", FileFormat.WixIR }, 25 { "wixirf", FileFormat.WixIR },
26 { "wixipl", FileFormat.WixIR },
26 { "wixobj", FileFormat.Wixobj }, 27 { "wixobj", FileFormat.Wixobj },
27 { "wixlib", FileFormat.Wixlib }, 28 { "wixlib", FileFormat.Wixlib },
28 { "wixout", FileFormat.Wixout }, 29 { "wixout", FileFormat.Wixout },