From 50bd11c35ebc48137eb01d69bdeb783c66479517 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 7 Oct 2017 15:06:20 -0700 Subject: Code cleanup --- src/WixToolset.BuildTasks/AssemblyInfo.cs | 7 - .../Properties/AssemblyInfo.cs | 7 + src/WixToolset.Core/AssemblyInfo.cs | 9 - .../CommandLine/CommandLineHelper.cs | 255 ----------- .../CommandLine/CommandLineResponseFile.cs | 5 - src/WixToolset.Core/Properties/AssemblyInfo.cs | 9 + src/wix/Program.cs | 482 +-------------------- src/wix/X_CommandLine.cs | 394 ----------------- 8 files changed, 26 insertions(+), 1142 deletions(-) delete mode 100644 src/WixToolset.BuildTasks/AssemblyInfo.cs create mode 100644 src/WixToolset.BuildTasks/Properties/AssemblyInfo.cs delete mode 100644 src/WixToolset.Core/AssemblyInfo.cs delete mode 100644 src/WixToolset.Core/CommandLine/CommandLineHelper.cs create mode 100644 src/WixToolset.Core/Properties/AssemblyInfo.cs delete mode 100644 src/wix/X_CommandLine.cs diff --git a/src/WixToolset.BuildTasks/AssemblyInfo.cs b/src/WixToolset.BuildTasks/AssemblyInfo.cs deleted file mode 100644 index ae52fce8..00000000 --- a/src/WixToolset.BuildTasks/AssemblyInfo.cs +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. - -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] diff --git a/src/WixToolset.BuildTasks/Properties/AssemblyInfo.cs b/src/WixToolset.BuildTasks/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..ae52fce8 --- /dev/null +++ b/src/WixToolset.BuildTasks/Properties/AssemblyInfo.cs @@ -0,0 +1,7 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. + +using System.Reflection; +using System.Runtime.InteropServices; + +[assembly: AssemblyCulture("")] +[assembly: ComVisible(false)] diff --git a/src/WixToolset.Core/AssemblyInfo.cs b/src/WixToolset.Core/AssemblyInfo.cs deleted file mode 100644 index b3740b2a..00000000 --- a/src/WixToolset.Core/AssemblyInfo.cs +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. - -using System; -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyCulture("")] -[assembly: CLSCompliant(true)] -[assembly: ComVisible(false)] diff --git a/src/WixToolset.Core/CommandLine/CommandLineHelper.cs b/src/WixToolset.Core/CommandLine/CommandLineHelper.cs deleted file mode 100644 index 86724603..00000000 --- a/src/WixToolset.Core/CommandLine/CommandLineHelper.cs +++ /dev/null @@ -1,255 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. - -namespace WixToolset -{ - using System; - using System.Collections.Generic; - using System.IO; - using System.Text; - using WixToolset.Data; - using WixToolset.Extensibility; - - /// - /// Common utilities for Wix command-line processing. - /// - public static class CommandLineHelper - { - /// - /// Get a set of files that possibly have a search pattern in the path (such as '*'). - /// - /// Search path to find files in. - /// Type of file; typically "Source". - /// An array of files matching the search path. - /// - /// This method is written in this verbose way because it needs to support ".." in the path. - /// It needs the directory path isolated from the file name in order to use Directory.GetFiles - /// or DirectoryInfo.GetFiles. The only way to get this directory path is manually since - /// Path.GetDirectoryName does not support ".." in the path. - /// - /// Throws WixFileNotFoundException if no file matching the pattern can be found. - public static string[] GetFiles(string searchPath, string fileType) - { - if (null == searchPath) - { - throw new ArgumentNullException("searchPath"); - } - - // convert alternate directory separators to the standard one - string filePath = searchPath.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar); - int lastSeparator = filePath.LastIndexOf(Path.DirectorySeparatorChar); - string[] files = null; - - try - { - if (0 > lastSeparator) - { - files = Directory.GetFiles(".", filePath); - } - else // found directory separator - { - files = Directory.GetFiles(filePath.Substring(0, lastSeparator + 1), filePath.Substring(lastSeparator + 1)); - } - } - catch (DirectoryNotFoundException) - { - // don't let this function throw the DirectoryNotFoundException. (this exception - // occurs for non-existant directories and invalid characters in the searchPattern) - } - catch (ArgumentException) - { - // don't let this function throw the ArgumentException. (this exception - // occurs in certain situations such as when passing a malformed UNC path) - } - catch (IOException) - { - throw new WixFileNotFoundException(searchPath, fileType); - } - - // file could not be found or path is invalid in some way - if (null == files || 0 == files.Length) - { - throw new WixFileNotFoundException(searchPath, fileType); - } - - return files; - } - - /// - /// Validates that a valid string parameter (without "/" or "-"), and returns a bool indicating its validity - /// - /// The list of strings to check. - /// The index (in args) of the commandline parameter to be validated. - /// True if a valid string parameter exists there, false if not. - public static bool IsValidArg(string[] args, int index) - { - if (args.Length <= index || String.IsNullOrEmpty(args[index]) || '/' == args[index][0] || '-' == args[index][0]) - { - return false; - } - else - { - return true; - } - } - - /// - /// Validates that a commandline parameter is a valid file or directory name, and throws appropriate warnings/errors if not - /// - /// The path to test. - /// The string if it is valid, null if it is invalid. - public static string VerifyPath(string path) - { - return VerifyPath(path, false); - } - - /// - /// Validates that a commandline parameter is a valid file or directory name, and throws appropriate warnings/errors if not - /// - /// The path to test. - /// Indicates if a colon-delimited prefix is allowed. - /// The full path if it is valid, null if it is invalid. - public static string VerifyPath(string path, bool allowPrefix) - { - string fullPath; - - if (0 <= path.IndexOf('\"')) - { - Messaging.Instance.OnMessage(WixErrors.PathCannotContainQuote(path)); - return null; - } - - try - { - string prefix = null; - if (allowPrefix) - { - int prefixLength = path.IndexOf('=') + 1; - if (0 != prefixLength) - { - prefix = path.Substring(0, prefixLength); - path = path.Substring(prefixLength); - } - } - - if (String.IsNullOrEmpty(prefix)) - { - fullPath = Path.GetFullPath(path); - } - else - { - fullPath = String.Concat(prefix, Path.GetFullPath(path)); - } - } - catch (Exception e) - { - Messaging.Instance.OnMessage(WixErrors.InvalidCommandLineFileName(path, e.Message)); - return null; - } - - return fullPath; - } - - /// - /// Validates that a string is a valid bind path, and throws appropriate warnings/errors if not - /// - /// The commandline switch we're parsing (for error display purposes). - /// The list of strings to check. - /// The index (in args) of the commandline parameter to be parsed. - /// The bind path if it is valid, null if it is invalid. - public static BindPath GetBindPath(string commandlineSwitch, string[] args, int index) - { - commandlineSwitch = String.Concat("-", commandlineSwitch); - - if (!IsValidArg(args, index)) - { - Messaging.Instance.OnMessage(WixErrors.DirectoryPathRequired(commandlineSwitch)); - return null; - } - - BindPath bindPath = BindPath.Parse(args[index]); - - if (File.Exists(bindPath.Path)) - { - Messaging.Instance.OnMessage(WixErrors.ExpectedDirectoryGotFile(commandlineSwitch, bindPath.Path)); - return null; - } - - bindPath.Path = VerifyPath(bindPath.Path, true); - return String.IsNullOrEmpty(bindPath.Path) ? null : bindPath; - } - - /// - /// Validates that a commandline parameter is a valid file or directory name, and throws appropriate warnings/errors if not - /// - /// The commandline switch we're parsing (for error display purposes). - /// The messagehandler to report warnings/errors to. - /// The list of strings to check. - /// The index (in args) of the commandline parameter to be parsed. - /// The string if it is valid, null if it is invalid. - public static string GetFileOrDirectory(string commandlineSwitch, string[] args, int index) - { - commandlineSwitch = String.Concat("-", commandlineSwitch); - - if (!IsValidArg(args, index)) - { - Messaging.Instance.OnMessage(WixErrors.FileOrDirectoryPathRequired(commandlineSwitch)); - return null; - } - - return VerifyPath(args[index]); - } - - /// - /// Validates that a string is a valid directory name, and throws appropriate warnings/errors if not - /// - /// The commandline switch we're parsing (for error display purposes). - /// The list of strings to check. - /// The index (in args) of the commandline parameter to be parsed. - /// Indicates if a colon-delimited prefix is allowed. - /// The string if it is valid, null if it is invalid. - public static string GetDirectory(string commandlineSwitch, string[] args, int index, bool allowPrefix = false) - { - commandlineSwitch = String.Concat("-", commandlineSwitch); - - if (!IsValidArg(args, index)) - { - Messaging.Instance.OnMessage(WixErrors.DirectoryPathRequired(commandlineSwitch)); - return null; - } - - if (File.Exists(args[index])) - { - Messaging.Instance.OnMessage(WixErrors.ExpectedDirectoryGotFile(commandlineSwitch, args[index])); - return null; - } - - return VerifyPath(args[index], allowPrefix); - } - - /// - /// Validates that a string is a valid filename, and throws appropriate warnings/errors if not - /// - /// The commandline switch we're parsing (for error display purposes). - /// The list of strings to check. - /// The index (in args) of the commandline parameter to be parsed. - /// The string if it is valid, null if it is invalid. - public static string GetFile(string commandlineSwitch, string[] args, int index) - { - commandlineSwitch = String.Concat("-", commandlineSwitch); - - if (!IsValidArg(args, index)) - { - Messaging.Instance.OnMessage(WixErrors.FilePathRequired(commandlineSwitch)); - return null; - } - - if (Directory.Exists(args[index])) - { - Messaging.Instance.OnMessage(WixErrors.ExpectedFileGotDirectory(commandlineSwitch, args[index])); - return null; - } - - return VerifyPath(args[index]); - } - } -} diff --git a/src/WixToolset.Core/CommandLine/CommandLineResponseFile.cs b/src/WixToolset.Core/CommandLine/CommandLineResponseFile.cs index f27296b7..578c3b22 100644 --- a/src/WixToolset.Core/CommandLine/CommandLineResponseFile.cs +++ b/src/WixToolset.Core/CommandLine/CommandLineResponseFile.cs @@ -102,11 +102,6 @@ namespace WixToolset return argsList.ToArray(); } - /// - /// Expand enxironment variables contained in the passed string - /// - /// - /// static private string ExpandEnvVars(string arguments) { IDictionary id = Environment.GetEnvironmentVariables(); diff --git a/src/WixToolset.Core/Properties/AssemblyInfo.cs b/src/WixToolset.Core/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..b3740b2a --- /dev/null +++ b/src/WixToolset.Core/Properties/AssemblyInfo.cs @@ -0,0 +1,9 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. + +using System; +using System.Reflection; +using System.Runtime.InteropServices; + +[assembly: AssemblyCulture("")] +[assembly: CLSCompliant(true)] +[assembly: ComVisible(false)] diff --git a/src/wix/Program.cs b/src/wix/Program.cs index 277f99fe..c60831d0 100644 --- a/src/wix/Program.cs +++ b/src/wix/Program.cs @@ -6,16 +6,12 @@ namespace WixToolset.Core using WixToolset.Data; /// - /// The main entry point for candle. + /// Wix Toolset Command-Line Interface. /// public sealed class Program { - //private IEnumerable preprocessorExtensions; - //private IEnumerable compilerExtensions; - //private IEnumerable extensionData; - /// - /// The main entry point for candle. + /// The main entry point for wix command-line interface. /// /// Commandline arguments for the application. /// Returns the application error code. @@ -33,474 +29,16 @@ namespace WixToolset.Core private static void DisplayMessage(object sender, DisplayEventArgs e) { - Console.WriteLine(e.Message); - } - -#if false - private static ICommand ParseCommandLine(string[] args) - { - var next = String.Empty; - - var command = Commands.Unknown; - var showLogo = true; - var showVersion = false; - var outputFolder = String.Empty; - var outputFile = String.Empty; - var sourceFile = String.Empty; - var verbose = false; - var files = new List(); - var defines = new List(); - var includePaths = new List(); - var locFiles = new List(); - var suppressedWarnings = new List(); - - var cli = CommandLine.Parse(args, (cmdline, arg) => Enum.TryParse(arg, true, out command), (cmdline, arg) => - { - if (cmdline.IsSwitch(arg)) - { - var parameter = arg.TrimStart(new[] { '-', '/' }); - switch (parameter.ToLowerInvariant()) - { - case "?": - case "h": - case "help": - cmdline.ShowHelp = true; - return true; - - case "d": - case "define": - cmdline.GetNextArgumentOrError(defines); - return true; - - case "i": - case "includepath": - cmdline.GetNextArgumentOrError(includePaths); - return true; - - case "loc": - cmdline.GetNextArgumentAsFilePathOrError(locFiles, "localization files"); - return true; - - case "o": - case "out": - cmdline.GetNextArgumentOrError(ref outputFile); - return true; - - case "nologo": - showLogo = false; - return true; - - case "v": - case "verbose": - verbose = true; - return true; - - case "version": - case "-version": - showVersion = true; - return true; - } - - return false; - } - else - { - files.AddRange(cmdline.GetFiles(arg, "source code")); - return true; - } - }); - - if (showVersion) - { - return new VersionCommand(); - } - - if (showLogo) - { - AppCommon.DisplayToolHeader(); - } - - if (cli.ShowHelp) - { - return new HelpCommand(command); - } - - switch (command) - { - case Commands.Build: - { - var sourceFiles = GatherSourceFiles(files, outputFolder); - var variables = GatherPreprocessorVariables(defines); - var extensions = cli.ExtensionManager; - return new BuildCommand(sourceFiles, variables, locFiles, outputFile); - } - - case Commands.Compile: - { - var sourceFiles = GatherSourceFiles(files, outputFolder); - var variables = GatherPreprocessorVariables(defines); - return new CompileCommand(sourceFiles, variables); - } - } - - return null; - } - - private static IEnumerable GatherSourceFiles(IEnumerable sourceFiles, string intermediateDirectory) - { - var files = new List(); - - foreach (var item in sourceFiles) - { - var sourcePath = item; - var outputPath = Path.Combine(intermediateDirectory, Path.GetFileNameWithoutExtension(sourcePath) + ".wir"); - - files.Add(new SourceFile(sourcePath, outputPath)); - } - - return files; - } - - private static IDictionary GatherPreprocessorVariables(IEnumerable defineConstants) - { - var variables = new Dictionary(); - - foreach (var pair in defineConstants) - { - string[] value = pair.Split(new[] { '=' }, 2); - - if (variables.ContainsKey(value[0])) - { - Messaging.Instance.OnMessage(WixErrors.DuplicateVariableDefinition(value[0], (1 == value.Length) ? String.Empty : value[1], variables[value[0]])); - continue; - } - - variables.Add(value[0], (1 == value.Length) ? String.Empty : value[1]); - } - - return variables; - } -#endif - -#if false - private static ICommand ParseCommandLine2(string[] args) - { - var command = Commands.Unknown; - - var nologo = false; - var outputFolder = String.Empty; - var outputFile = String.Empty; - var sourceFile = String.Empty; - var verbose = false; - IReadOnlyList files = Array.Empty(); - IReadOnlyList defines = Array.Empty(); - IReadOnlyList includePaths = Array.Empty(); - IReadOnlyList suppressedWarnings = Array.Empty(); - IReadOnlyList locFiles = Array.Empty(); - - ArgumentSyntax parsed = null; - try - { - parsed = ArgumentSyntax.Parse(args, syntax => - { - syntax.HandleErrors = false; - //syntax.HandleHelp = false; - syntax.ErrorOnUnexpectedArguments = false; - - syntax.DefineCommand("build", ref command, Commands.Build, "Build to final output"); - syntax.DefineOptionList("d|D|define", ref defines, "Preprocessor name value pairs"); - syntax.DefineOptionList("I|includePath", ref includePaths, "Include search paths"); - syntax.DefineOption("nologo", ref nologo, false, "Do not display logo"); - syntax.DefineOption("o|out", ref outputFile, "Output file"); - syntax.DefineOptionList("sw", ref suppressedWarnings, false, "Do not display logo"); - syntax.DefineOption("v|verbose", ref verbose, false, "Display verbose messages"); - syntax.DefineOptionList("l|loc", ref locFiles, "Localization files to load (.wxl)"); - syntax.DefineParameterList("files", ref files, "Source files to compile (.wxs)"); - - syntax.DefineCommand("preprocess", ref command, Commands.Preprocess, "Preprocess a source files"); - syntax.DefineOptionList("d|D|define", ref defines, "Preprocessor name value pairs"); - syntax.DefineOptionList("I|includePath", ref includePaths, "Include search paths"); - syntax.DefineOption("nologo", ref nologo, false, "Do not display logo"); - syntax.DefineOption("o|out", ref outputFile, "Output file"); - syntax.DefineParameter("file", ref sourceFile, "File to process"); - - syntax.DefineCommand("compile", ref command, Commands.Compile, "Compile source files"); - syntax.DefineOptionList("I|includePath", ref includePaths, "Include search paths"); - syntax.DefineOption("nologo", ref nologo, false, "Do not display logo"); - syntax.DefineOption("o|out", ref outputFolder, "Output folder"); - syntax.DefineOptionList("sw", ref suppressedWarnings, false, "Do not display logo"); - syntax.DefineOption("v|verbose", ref verbose, false, "Display verbose messages"); - syntax.DefineParameterList("files", ref files, "Source files to compile (.wxs)"); - - syntax.DefineCommand("link", ref command, Commands.Link, "Link intermediate files"); - syntax.DefineOption("nologo", ref nologo, "Do not display logo"); - syntax.DefineOption("o|out", ref outputFile, "Output intermediate file (.wir)"); - syntax.DefineParameterList("files", ref files, "Intermediate files to link (.wir)"); - - syntax.DefineCommand("bind", ref command, Commands.Bind, "Bind to final output"); - syntax.DefineOption("nologo", ref nologo, false, "Do not display logo"); - syntax.DefineOption("o|out", ref outputFile, "Output file"); - syntax.DefineParameterList("files", ref files, "Intermediate files to bind (.wir)"); - - syntax.DefineCommand("version", ref command, Commands.Version, "Display version information"); - }); - - if (IsHelpRequested(parsed)) - { - var width = Console.WindowWidth - 2; - var text = parsed.GetHelpText(width < 20 ? 72 : width); - Console.Error.WriteLine(text); - - return null; - } - - //var u = result.GetArguments(); - - //var p = result.GetActiveParameters(); - - //var o = result.GetActiveOptions(); - - //var a = result.GetActiveArguments(); - - //var h = result.GetHelpText(); - - //foreach (var x in p) - //{ - // Console.WriteLine("{0}", x.Name); - //} - - switch (command) - { - case Commands.Build: - { - var sourceFiles = GatherSourceFiles(files, outputFolder); - var variables = GatherPreprocessorVariables(defines); - return new BuildCommand(sourceFiles, variables, locFiles, outputFile); - } - - case Commands.Compile: - { - var sourceFiles = GatherSourceFiles(files, outputFolder); - var variables = GatherPreprocessorVariables(defines); - return new CompileCommand(sourceFiles, variables); - } - - case Commands.Version: - return new VersionCommand(); - } - - //var preprocessorVariables = this.GatherPreprocessorVariables(); - - //foreach (var sourceFile in sourceFiles) - //{ - // var document = preprocessor.Process(sourceFile.SourcePath, preprocessorVariables); - - // var intermediate = compiler.Compile(document); - - // intermediate.Save(sourceFile.OutputPath); - //} - } - //catch (ArgumentSyntaxException e) - //{ - // if (IsHelpRequested(parsed)) - // { - // var width = Console.WindowWidth - 2; - // var text = parsed.GetHelpText(width < 20 ? 72 : width); - // Console.Error.WriteLine(text); - // } - // else - // { - // Console.Error.WriteLine(e.Message); - // } - //} - - return null; - } - - //private static bool IsHelpRequested(ArgumentSyntax syntax) - //{ - // return syntax?.RemainingArguments - // .Any(a => String.Equals(a, @"-?", StringComparison.Ordinal) || - // String.Equals(a, @"-h", StringComparison.Ordinal) || - // String.Equals(a, @"--help", StringComparison.Ordinal)) ?? false; - //} -#endif - -#if false - private int Execute(string[] args) - { - try - { - string[] unparsed = this.ParseCommandLineAndLoadExtensions(args); - - if (!Messaging.Instance.EncounteredError) - { - if (this.commandLine.ShowLogo) - { - AppCommon.DisplayToolHeader(); - } - - if (this.commandLine.ShowHelp) - { - Console.WriteLine(CandleStrings.HelpMessage); - AppCommon.DisplayToolFooter(); - } - else - { - foreach (string arg in unparsed) - { - Messaging.Instance.OnMessage(WixWarnings.UnsupportedCommandLineArgument(arg)); - } - - this.Run(); - } - } - } - catch (WixException we) - { - Messaging.Instance.OnMessage(we.Error); - } - catch (Exception e) - { - Messaging.Instance.OnMessage(WixErrors.UnexpectedException(e.Message, e.GetType().ToString(), e.StackTrace)); - if (e is NullReferenceException || e is SEHException) - { - throw; - } - } - - return Messaging.Instance.LastErrorNumber; - } - - private string[] ParseCommandLineAndLoadExtensions(string[] args) - { - this.commandLine = new CandleCommandLine(); - string[] unprocessed = commandLine.Parse(args); - if (Messaging.Instance.EncounteredError) - { - return unprocessed; - } - - // Load extensions. - ExtensionManager extensionManager = new ExtensionManager(); - foreach (string extension in this.commandLine.Extensions) - { - extensionManager.Load(extension); - } - - // Preprocessor extension command line processing. - this.preprocessorExtensions = extensionManager.Create(); - foreach (IExtensionCommandLine pce in this.preprocessorExtensions.Where(e => e is IExtensionCommandLine).Cast()) - { - pce.MessageHandler = Messaging.Instance; - unprocessed = pce.ParseCommandLine(unprocessed); - } - - // Compiler extension command line processing. - this.compilerExtensions = extensionManager.Create(); - foreach (IExtensionCommandLine cce in this.compilerExtensions.Where(e => e is IExtensionCommandLine).Cast()) - { - cce.MessageHandler = Messaging.Instance; - unprocessed = cce.ParseCommandLine(unprocessed); - } - - // Extension data command line processing. - this.extensionData = extensionManager.Create(); - foreach (IExtensionCommandLine dce in this.extensionData.Where(e => e is IExtensionCommandLine).Cast()) + switch (e.Level) { - dce.MessageHandler = Messaging.Instance; - unprocessed = dce.ParseCommandLine(unprocessed); + case MessageLevel.Warning: + case MessageLevel.Error: + Console.Error.WriteLine(e.Message); + break; + default: + Console.WriteLine(e.Message); + break; } - - return commandLine.ParsePostExtensions(unprocessed); - } - - private void Run() - { - // Create the preprocessor and compiler - Preprocessor preprocessor = new Preprocessor(); - preprocessor.CurrentPlatform = this.commandLine.Platform; - - foreach (string includePath in this.commandLine.IncludeSearchPaths) - { - preprocessor.IncludeSearchPaths.Add(includePath); - } - - foreach (IPreprocessorExtension pe in this.preprocessorExtensions) - { - preprocessor.AddExtension(pe); - } - - Compiler compiler = new Compiler(); - compiler.ShowPedanticMessages = this.commandLine.ShowPedanticMessages; - compiler.CurrentPlatform = this.commandLine.Platform; - - foreach (IExtensionData ed in this.extensionData) - { - compiler.AddExtensionData(ed); - } - - foreach (ICompilerExtension ce in this.compilerExtensions) - { - compiler.AddExtension(ce); - } - - // Preprocess then compile each source file. - foreach (CompileFile file in this.commandLine.Files) - { - // print friendly message saying what file is being compiled - Console.WriteLine(file.SourcePath); - - // preprocess the source - XDocument sourceDocument; - try - { - if (!String.IsNullOrEmpty(this.commandLine.PreprocessFile)) - { - preprocessor.PreprocessOut = this.commandLine.PreprocessFile.Equals("con:", StringComparison.OrdinalIgnoreCase) ? Console.Out : new StreamWriter(this.commandLine.PreprocessFile); - } - - sourceDocument = preprocessor.Process(file.SourcePath, this.commandLine.PreprocessorVariables); - } - finally - { - if (null != preprocessor.PreprocessOut && Console.Out != preprocessor.PreprocessOut) - { - preprocessor.PreprocessOut.Close(); - } - } - - // If we're not actually going to compile anything, move on to the next file. - if (null == sourceDocument || !String.IsNullOrEmpty(this.commandLine.PreprocessFile)) - { - continue; - } - - // and now we do what we came here to do... - Intermediate intermediate = compiler.Compile(sourceDocument); - - // save the intermediate to disk if no errors were found for this source file - if (null != intermediate) - { - intermediate.Save(file.OutputPath); - } - } - } - - public interface IOptions - { - IEnumerable SourceFiles { get; } - } - - public class CompilerOptions : IOptions - { - public CompilerOptions(IEnumerable sources) - { - this.SourceFiles = sources; - } - - public IEnumerable SourceFiles { get; private set; } } -#endif } } diff --git a/src/wix/X_CommandLine.cs b/src/wix/X_CommandLine.cs deleted file mode 100644 index 2c7ceb83..00000000 --- a/src/wix/X_CommandLine.cs +++ /dev/null @@ -1,394 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. - -namespace WixToolset.Core -{ - using System; - using System.Collections.Generic; - using System.IO; - using System.Linq; - using System.Text; - using System.Text.RegularExpressions; - using WixToolset.Extensibility; - - internal class X_CommandLine - { - private X_CommandLine() - { - } - - public static string ExpectedArgument { get; } = "expected argument"; - - public string ActiveCommand { get; private set; } - - public string[] OriginalArguments { get; private set; } - - public Queue RemainingArguments { get; } = new Queue(); - - public ExtensionManager ExtensionManager { get; } = new ExtensionManager(); - - public string ErrorArgument { get; set; } - - public bool ShowHelp { get; set; } - - public static X_CommandLine Parse(string commandLineString, Func parseArgument) - { - var arguments = X_CommandLine.ParseArgumentsToArray(commandLineString).ToArray(); - - return X_CommandLine.Parse(arguments, null, parseArgument); - } - - public static X_CommandLine Parse(string[] commandLineArguments, Func parseArgument) - { - return X_CommandLine.Parse(commandLineArguments, null, parseArgument); - } - - public static X_CommandLine Parse(string[] commandLineArguments, Func parseCommand, Func parseArgument) - { - var cmdline = new X_CommandLine(); - - cmdline.FlattenArgumentsWithResponseFilesIntoOriginalArguments(commandLineArguments); - - cmdline.QueueArgumentsAndLoadExtensions(cmdline.OriginalArguments); - - cmdline.ProcessRemainingArguments(parseArgument, parseCommand); - - return cmdline; - } - - /// - /// Get a set of files that possibly have a search pattern in the path (such as '*'). - /// - /// Search path to find files in. - /// Type of file; typically "Source". - /// An array of files matching the search path. - /// - /// This method is written in this verbose way because it needs to support ".." in the path. - /// It needs the directory path isolated from the file name in order to use Directory.GetFiles - /// or DirectoryInfo.GetFiles. The only way to get this directory path is manually since - /// Path.GetDirectoryName does not support ".." in the path. - /// - /// Throws WixFileNotFoundException if no file matching the pattern can be found. - public string[] GetFiles(string searchPath, string fileType) - { - if (null == searchPath) - { - throw new ArgumentNullException(nameof(searchPath)); - } - - // Convert alternate directory separators to the standard one. - string filePath = searchPath.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar); - int lastSeparator = filePath.LastIndexOf(Path.DirectorySeparatorChar); - string[] files = null; - - try - { - if (0 > lastSeparator) - { - files = Directory.GetFiles(".", filePath); - } - else // found directory separator - { - files = Directory.GetFiles(filePath.Substring(0, lastSeparator + 1), filePath.Substring(lastSeparator + 1)); - } - } - catch (DirectoryNotFoundException) - { - // Don't let this function throw the DirectoryNotFoundException. This exception - // occurs for non-existant directories and invalid characters in the searchPattern. - } - catch (ArgumentException) - { - // Don't let this function throw the ArgumentException. This exception - // occurs in certain situations such as when passing a malformed UNC path. - } - catch (IOException) - { - throw new WixFileNotFoundException(searchPath, fileType); - } - - if (null == files || 0 == files.Length) - { - throw new WixFileNotFoundException(searchPath, fileType); - } - - return files; - } - - /// - /// Validates that a valid switch (starts with "/" or "-"), and returns a bool indicating its validity - /// - /// The list of strings to check. - /// The index (in args) of the commandline parameter to be validated. - /// True if a valid switch exists there, false if not. - public bool IsSwitch(string arg) - { - return arg != null && ('/' == arg[0] || '-' == arg[0]); - } - - /// - /// Validates that a valid switch (starts with "/" or "-"), and returns a bool indicating its validity - /// - /// The list of strings to check. - /// The index (in args) of the commandline parameter to be validated. - /// True if a valid switch exists there, false if not. - public bool IsSwitchAt(IEnumerable args, int index) - { - var arg = args.ElementAtOrDefault(index); - return IsSwitch(arg); - } - - public void GetNextArgumentOrError(ref string arg) - { - this.TryGetNextArgumentOrError(out arg); - } - - public void GetNextArgumentOrError(IList args) - { - if (this.TryGetNextArgumentOrError(out var arg)) - { - args.Add(arg); - } - } - - public void GetNextArgumentAsFilePathOrError(IList args, string fileType) - { - if (this.TryGetNextArgumentOrError(out var arg)) - { - foreach (var path in this.GetFiles(arg, fileType)) - { - args.Add(path); - } - } - } - - public bool TryGetNextArgumentOrError(out string arg) - { - if (this.RemainingArguments.TryDequeue(out arg) && !this.IsSwitch(arg)) - { - return true; - } - - this.ErrorArgument = arg ?? X_CommandLine.ExpectedArgument; - - return false; - } - - private void FlattenArgumentsWithResponseFilesIntoOriginalArguments(string[] commandLineArguments) - { - List args = new List(); - - foreach (var arg in commandLineArguments) - { - if ('@' == arg[0]) - { - var responseFileArguments = X_CommandLine.ParseResponseFile(arg.Substring(1)); - args.AddRange(responseFileArguments); - } - else - { - args.Add(arg); - } - } - - this.OriginalArguments = args.ToArray(); - } - - private void QueueArgumentsAndLoadExtensions(string[] args) - { - for (var i = 0; i < args.Length; ++i) - { - var arg = args[i]; - - if ("-ext" == arg || "/ext" == arg) - { - if (!this.IsSwitchAt(args, ++i)) - { - this.ExtensionManager.Load(args[i]); - } - else - { - this.ErrorArgument = arg; - break; - } - } - else - { - this.RemainingArguments.Enqueue(arg); - } - } - } - - private void ProcessRemainingArguments(Func parseArgument, Func parseCommand) - { - var extensions = this.ExtensionManager.Create(); - - while (!this.ShowHelp && - String.IsNullOrEmpty(this.ErrorArgument) && - this.RemainingArguments.TryDequeue(out var arg)) - { - if (String.IsNullOrWhiteSpace(arg)) // skip blank arguments. - { - continue; - } - - if ('-' == arg[0] || '/' == arg[0]) - { - if (!parseArgument(this, arg) && - !this.TryParseCommandLineArgumentWithExtension(arg, extensions)) - { - this.ErrorArgument = arg; - } - } - else if (String.IsNullOrEmpty(this.ActiveCommand) && parseCommand != null) // First non-switch must be the command, if commands are supported. - { - if (parseCommand(this, arg)) - { - this.ActiveCommand = arg; - } - else - { - this.ErrorArgument = arg; - } - } - else if (!this.TryParseCommandLineArgumentWithExtension(arg, extensions) && - !parseArgument(this, arg)) - { - this.ErrorArgument = arg; - } - } - } - - private bool TryParseCommandLineArgumentWithExtension(string arg, IEnumerable extensions) - { - foreach (var extension in extensions) - { - //if (extension.ParseArgument(this, arg)) - //{ - // return true; - //} - } - - return false; - } - - /// - /// Parses a response file. - /// - /// The file to parse. - /// The array of arguments. - private static List ParseResponseFile(string responseFile) - { - string arguments; - - using (StreamReader reader = new StreamReader(responseFile)) - { - arguments = reader.ReadToEnd(); - } - - return X_CommandLine.ParseArgumentsToArray(arguments); - } - - /// - /// Parses an argument string into an argument array based on whitespace and quoting. - /// - /// Argument string. - /// Argument array. - private static List ParseArgumentsToArray(string arguments) - { - // Scan and parse the arguments string, dividing up the arguments based on whitespace. - // Unescaped quotes cause whitespace to be ignored, while the quotes themselves are removed. - // Quotes may begin and end inside arguments; they don't necessarily just surround whole arguments. - // Escaped quotes and escaped backslashes also need to be unescaped by this process. - - // Collects the final list of arguments to be returned. - var argsList = new List(); - - // True if we are inside an unescaped quote, meaning whitespace should be ignored. - var insideQuote = false; - - // Index of the start of the current argument substring; either the start of the argument - // or the start of a quoted or unquoted sequence within it. - var partStart = 0; - - // The current argument string being built; when completed it will be added to the list. - var arg = new StringBuilder(); - - for (int i = 0; i <= arguments.Length; i++) - { - if (i == arguments.Length || (Char.IsWhiteSpace(arguments[i]) && !insideQuote)) - { - // Reached a whitespace separator or the end of the string. - - // Finish building the current argument. - arg.Append(arguments.Substring(partStart, i - partStart)); - - // Skip over the whitespace character. - partStart = i + 1; - - // Add the argument to the list if it's not empty. - if (arg.Length > 0) - { - argsList.Add(X_CommandLine.ExpandEnvVars(arg.ToString())); - arg.Length = 0; - } - } - else if (i > partStart && arguments[i - 1] == '\\') - { - // Check the character following an unprocessed backslash. - // Unescape quotes, and backslashes followed by a quote. - if (arguments[i] == '"' || (arguments[i] == '\\' && arguments.Length > i + 1 && arguments[i + 1] == '"')) - { - // Unescape the quote or backslash by skipping the preceeding backslash. - arg.Append(arguments.Substring(partStart, i - 1 - partStart)); - arg.Append(arguments[i]); - partStart = i + 1; - } - } - else if (arguments[i] == '"') - { - // Add the quoted or unquoted section to the argument string. - arg.Append(arguments.Substring(partStart, i - partStart)); - - // And skip over the quote character. - partStart = i + 1; - - insideQuote = !insideQuote; - } - } - - return argsList; - } - - /// - /// Expand enxironment variables contained in the passed string - /// - /// - /// - private static string ExpandEnvVars(string arguments) - { - var id = Environment.GetEnvironmentVariables(); - - var regex = new Regex("(?<=\\%)(?:[\\w\\.]+)(?=\\%)"); - MatchCollection matches = regex.Matches(arguments); - - string value = String.Empty; - for (int i = 0; i <= (matches.Count - 1); i++) - { - try - { - var key = matches[i].Value; - regex = new Regex(String.Concat("(?i)(?:\\%)(?:", key, ")(?:\\%)")); - value = id[key].ToString(); - arguments = regex.Replace(arguments, value); - } - catch (NullReferenceException) - { - // Collapse unresolved environment variables. - arguments = regex.Replace(arguments, value); - } - } - - return arguments; - } - } -} -- cgit v1.2.3-55-g6feb