Implement support for IExtensionCommandLine and IPreprocessorExtension

3 files changed, 39 insertions, 18 deletions

diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs
index 54bf688d..79bacd22 100644
--- a/src/WixToolset.Core/CommandLine/BuildCommand.cs
+++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs
@@ -40,6 +40,8 @@ namespace WixToolset.Core
 
         public IExtensionManager ExtensionManager { get; }
 
+        public IEnumerable<string> IncludeSearchPaths { get; }
+
         public IEnumerable<string> LocFiles { get; }
 
         public IEnumerable<string> LibraryFiles { get; }
@@ -102,15 +104,18 @@ namespace WixToolset.Core
         {
             var intermediates = new List<Intermediate>();
 
-
             foreach (var sourceFile in this.SourceFiles)
             {
-                //var preprocessContext = this.ServiceProvider.GetService<IPreprocessContext>();
-                //preprocessContext.SourcePath = sourceFile.SourcePath;
-                //preprocessContext.Variables = this.PreprocessorVariables;
+                var preprocessContext = this.ServiceProvider.GetService<IPreprocessContext>();
+                preprocessContext.Messaging = Messaging.Instance;
+                preprocessContext.Extensions = this.ExtensionManager.Create<IPreprocessorExtension>();
+                preprocessContext.Platform = Platform.X86; // TODO: set this correctly
+                preprocessContext.IncludeSearchPaths = this.IncludeSearchPaths?.ToList() ?? new List<string>();
+                preprocessContext.SourceFile = sourceFile.SourcePath;
+                preprocessContext.Variables = new Dictionary<string, string>(this.PreprocessorVariables);
 
                 var preprocessor = new Preprocessor();
-                var document = preprocessor.Process(sourceFile.SourcePath, this.PreprocessorVariables);
+                var document = preprocessor.Process(preprocessContext);
 
                 var compileContext = this.ServiceProvider.GetService<ICompileContext>();
                 compileContext.Messaging = Messaging.Instance;
diff --git a/src/WixToolset.Core/CommandLine/CommandLine.cs b/src/WixToolset.Core/CommandLine/CommandLine.cs
index c6fe11b7..9bedca9a 100644
--- a/src/WixToolset.Core/CommandLine/CommandLine.cs
+++ b/src/WixToolset.Core/CommandLine/CommandLine.cs
@@ -22,7 +22,7 @@ namespace WixToolset.Core
         Bind,
     }
 
-    internal class CommandLine : ICommandLine
+    internal class CommandLine : ICommandLine, IParseCommandLine
     {
         public CommandLine()
         {
@@ -57,10 +57,10 @@ namespace WixToolset.Core
                 args = CommandLine.ParseArgumentsToArray(context.Arguments).Union(args).ToArray();
             }
 
-            return this.ParseStandardCommandLine(args);
+            return this.ParseStandardCommandLine(context, args);
         }
 
-        private ICommandLineCommand ParseStandardCommandLine(string[] args)
+        private ICommandLineCommand ParseStandardCommandLine(ICommandLineContext context, string[] args)
         {
             var next = String.Empty;
 
@@ -90,7 +90,7 @@ namespace WixToolset.Core
             var builtOutputsFile = String.Empty;
             var wixProjectFile = String.Empty;
 
-            this.Parse(args, (cmdline, arg) => Enum.TryParse(arg, true, out command), (cmdline, arg) =>
+            this.Parse(context, args, (cmdline, arg) => Enum.TryParse(arg, true, out command), (cmdline, arg) =>
             {
                 if (cmdline.IsSwitch(arg))
                 {
@@ -279,13 +279,13 @@ namespace WixToolset.Core
         }
 #endif
 
-        private ICommandLine Parse(string[] commandLineArguments, Func<CommandLine, string, bool> parseCommand, Func<CommandLine, string, bool> parseArgument)
+        private ICommandLine Parse(ICommandLineContext context, string[] commandLineArguments, Func<CommandLine, string, bool> parseCommand, Func<CommandLine, string, bool> parseArgument)
         {
             this.FlattenArgumentsWithResponseFilesIntoOriginalArguments(commandLineArguments);
 
             this.QueueArgumentsAndLoadExtensions(this.OriginalArguments);
 
-            this.ProcessRemainingArguments(parseArgument, parseCommand);
+            this.ProcessRemainingArguments(context, parseArgument, parseCommand);
 
             return this;
         }
@@ -413,7 +413,7 @@ namespace WixToolset.Core
         /// <returns>True if a valid switch exists there, false if not.</returns>
         public bool IsSwitch(string arg)
         {
-            return arg != null && ('/' == arg[0] || '-' == arg[0]);
+            return arg != null && arg.Length > 1 && ('/' == arg[0] || '-' == arg[0]);
         }
 
         /// <summary>
@@ -522,10 +522,15 @@ namespace WixToolset.Core
             }
         }
 
-        private void ProcessRemainingArguments(Func<CommandLine, string, bool> parseArgument, Func<CommandLine, string, bool> parseCommand)
+        private void ProcessRemainingArguments(ICommandLineContext context, Func<CommandLine, string, bool> parseArgument, Func<CommandLine, string, bool> parseCommand)
         {
             var extensions = this.ExtensionManager.Create<IExtensionCommandLine>();
 
+            foreach (var extension in extensions)
+            {
+                extension.PreParse(context);
+            }
+
             while (!this.ShowHelp &&
                    String.IsNullOrEmpty(this.ErrorArgument) &&
                    TryDequeue(this.RemainingArguments, out var arg))
@@ -566,10 +571,10 @@ namespace WixToolset.Core
         {
             foreach (var extension in extensions)
             {
-                //if (extension.ParseArgument(this, arg))
-                //{
-                //    return true;
-                //}
+                if (extension.TryParseArgument(this, arg))
+                {
+                    return true;
+                }
             }
 
             return false;
diff --git a/src/WixToolset.Core/CommandLine/CompileCommand.cs b/src/WixToolset.Core/CommandLine/CompileCommand.cs
index 58ba9d29..e7fcdd4d 100644
--- a/src/WixToolset.Core/CommandLine/CompileCommand.cs
+++ b/src/WixToolset.Core/CommandLine/CompileCommand.cs
@@ -4,6 +4,7 @@ namespace WixToolset.Core
 {
     using System;
     using System.Collections.Generic;
+    using System.Linq;
     using WixToolset.Data;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Services;
@@ -22,6 +23,8 @@ namespace WixToolset.Core
 
         private IExtensionManager ExtensionManager { get; }
 
+        public IEnumerable<string> IncludeSearchPaths { get; }
+
         private IEnumerable<SourceFile> SourceFiles { get; }
 
         private IDictionary<string, string> PreprocessorVariables { get; }
@@ -30,8 +33,16 @@ namespace WixToolset.Core
         {
             foreach (var sourceFile in this.SourceFiles)
             {
+                var preprocessContext = this.ServiceProvider.GetService<IPreprocessContext>();
+                preprocessContext.Messaging = Messaging.Instance;
+                preprocessContext.Extensions = this.ExtensionManager.Create<IPreprocessorExtension>();
+                preprocessContext.Platform = Platform.X86; // TODO: set this correctly
+                preprocessContext.IncludeSearchPaths = this.IncludeSearchPaths?.ToList() ?? new List<string>();
+                preprocessContext.SourceFile = sourceFile.SourcePath;
+                preprocessContext.Variables = new Dictionary<string, string>(this.PreprocessorVariables);
+
                 var preprocessor = new Preprocessor();
-                var document = preprocessor.Process(sourceFile.SourcePath, this.PreprocessorVariables);
+                var document = preprocessor.Process(preprocessContext);
 
                 var compileContext = this.ServiceProvider.GetService<ICompileContext>();
                 compileContext.Messaging = Messaging.Instance;