Skip to content

[generator] Allow multiple generator --apiversions #593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 5, 2020
Merged

[generator] Allow multiple generator --apiversions #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tools/generator/CodeGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ static void Run (CodeGeneratorOptions options, DirectoryAssemblyResolver resolve
string enum_flags = options.EnumFlagsFile;
string enum_methods_map = options.EnumMethodsMapFile;
var fixups = options.FixupFiles;
string api_versions_xml = options.ApiVersionsXmlFile;
var annotations_zips = options.AnnotationsZipFiles;
string filename = options.ApiDescriptionFile;
string mapping_file = options.MappingReportFile;
Expand Down Expand Up @@ -157,8 +156,9 @@ static void Run (CodeGeneratorOptions options, DirectoryAssemblyResolver resolve

Validate (gens, opt, new CodeGeneratorContext ());

if (api_versions_xml != null)
foreach (var api_versions_xml in options.ApiVersionsXmlFiles) {
ApiVersionsSupport.AssignApiLevels (gens, api_versions_xml);
}

foreach (GenBase gen in gens)
gen.FillProperties ();
Expand Down
5 changes: 4 additions & 1 deletion tools/generator/CodeGeneratorOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public class CodeGeneratorOptions
{
public CodeGeneratorOptions ()
{
ApiVersionsXmlFiles = new Collection<string> ();
AssemblyReferences = new Collection<string> ();
FixupFiles = new Collection<string> ();
LibraryPaths = new Collection<string> ();
Expand All @@ -26,7 +27,9 @@ public CodeGeneratorOptions ()
public bool GlobalTypeNames {get; set;}
public bool OnlyBindPublicTypes {get; set;}
public string ApiDescriptionFile {get; set;}
[Obsolete ("Use ApiVersionsXmlFiles")]
public string ApiVersionsXmlFile {get; set;}
public Collection<string> ApiVersionsXmlFiles {get; set;}
public Collection<string> AnnotationsZipFiles {get; set;}
public string EnumFieldsMapFile {get; set;}
public string EnumFlagsFile {get; set;}
Expand Down Expand Up @@ -138,7 +141,7 @@ public static CodeGeneratorOptions Parse (string[] args)
v => opts.EnumMethodsMapFile = v },
{ "apiversions=",
"For internal use.",
v => opts.ApiVersionsXmlFile = v },
v => opts.ApiVersionsXmlFiles.Add (v) },
{ "annotations=",
"For internal use.",
v => opts.AnnotationsZipFiles.Add (v) },
Expand Down