Removed old options usage from Main.cs.

This commit is contained in:
Jarl Gullberg 2017-07-15 15:42:51 +02:00
parent e39a4cb48f
commit 36357873a7
No known key found for this signature in database
GPG key ID: 750FF6F6BDA72D23

View file

@ -28,7 +28,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Xml; using System.Xml;
using System.Xml.Linq; using System.Xml.Linq;
using Mono.Options; using CommandLine;
namespace OpenTK.Convert namespace OpenTK.Convert
{ {
@ -62,45 +62,19 @@ namespace OpenTK.Convert
class EntryPoint class EntryPoint
{ {
static Options CLIOptions;
static void Main(string[] args) static void Main(string[] args)
{ {
CommandLine.Parser.Default.ParseArguments<Options>(args)
.WithParsed(result => CLIOptions = result)
.WithNotParsed(error => Environment.Exit(-1));
try try
{ {
bool showHelp = false; Parser parser = new GLXmlParser { Prefix = CLIOptions.Prefix };
string prefix = "gl";
string path = null;
OptionSet opts = new OptionSet
{
{ "p=", "The {PREFIX} to remove from parsed functions and constants. " +
"Defaults to \"" + prefix + "\".",
v => prefix = v },
{ "o:", "The {PATH} to the output file.",
v => path = v },
{ "?|h|help", "Show this message and exit.",
v => showHelp = v != null },
};
var headers = opts.Parse(args);
var app = Path.GetFileName(Environment.GetCommandLineArgs()[0]);
if (showHelp)
{
Console.WriteLine("usage: {0} -p:PREFIX SPECIFICATIONS", app);
Console.WriteLine();
Console.WriteLine("Options:");
opts.WriteOptionDescriptions(Console.Out);
Console.WriteLine();
Console.WriteLine("SPECIFICATIONS are the Khronos XML files to parse into OpenTK XML.");
return;
}
if (prefix == null)
{
Console.WriteLine("{0}: missing required parameter -p.", app);
Console.WriteLine("Use '{0} --help' for usage.", app);
return;
}
Parser parser = new GLXmlParser { Prefix = prefix }; var sigs = CLIOptions.InputFiles.Select(h => parser.Parse(h)).ToList();
var sigs = headers.Select(h => parser.Parse(h)).ToList();
// Merge any duplicate enum entries (in case an enum is declared // Merge any duplicate enum entries (in case an enum is declared
// in multiple files with different entries in each file). // in multiple files with different entries in each file).
@ -112,14 +86,14 @@ namespace OpenTK.Convert
settings.Encoding = System.Text.Encoding.UTF8; settings.Encoding = System.Text.Encoding.UTF8;
TextWriter out_stream = null; TextWriter out_stream = null;
if (path == null) if (CLIOptions.OutputFile == null)
{ {
out_stream = Console.Out; out_stream = Console.Out;
Console.OutputEncoding = System.Text.Encoding.UTF8; Console.OutputEncoding = System.Text.Encoding.UTF8;
} }
else else
{ {
out_stream = new StreamWriter(path, false); out_stream = new StreamWriter(CLIOptions.OutputFile, false);
} }
using (var writer = XmlWriter.Create(out_stream, settings)) using (var writer = XmlWriter.Create(out_stream, settings))