Skip to content

[jnimarshalmethod-gen] Add -p|--profile option #355

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 4 commits into from
Aug 13, 2018
Merged

[jnimarshalmethod-gen] Add -p|--profile option #355

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64d370b
[jnimarshalmethod-gen] Add -p|--profile option
radekdoulik Aug 7, 2018
7f8d655
[jnimarshalmethod-gen] Use {Environment.NewLine} in the messages
radekdoulik Aug 9, 2018
09f4d08
Fix indentation.
jonpryor Aug 10, 2018
356e168
Rename `--profile` to `--types`
jonpryor Aug 13, 2018
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
27 changes: 25 additions & 2 deletions tools/jnimarshalmethod-gen/App.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@ List<string> ProcessArguments (string [] args)
{ "h|help|?",
"Show this message and exit",
v => help = v != null },
{ "types=",
"Generate marshaling methods only for types whose names match regex patterns listed {FILE}.\n" +
"One regex pattern per line.\n" +
"Empty lines and lines starting with '#' character are ignored as comments.",
v => LoadTypes (v) },
{ "t|type=",
"Generate marshaling methods only for types whose names match {TYPE-REGEX}.",
v => typeNameRegexes.Add (new Regex (v)) },
Expand All @@ -116,6 +121,24 @@ List<string> ProcessArguments (string [] args)
return assemblies;
}

void LoadTypes (string typesPath)
{
try {
foreach (var line in File.ReadLines (typesPath)) {
if (string.IsNullOrWhiteSpace (line))
continue;

if (line [0] == '#')
continue;

typeNameRegexes.Add (new Regex (line));
}
} catch (Exception e) {
Error ($"Unable to read profile '{typesPath}'.{Environment.NewLine}{e}");
Environment.Exit (4);
}
}

void ProcessAssemblies (List<string> assemblies)
{
CreateJavaVM (jvmDllPath);
Expand Down Expand Up @@ -153,7 +176,7 @@ void ProcessAssemblies (List<string> assemblies)
try {
CreateMarshalMethodAssembly (assembly);
} catch (Exception e) {
Error ($"Unable to process assembly '{assembly}'\n{e.Message}\n{e}");
Error ($"Unable to process assembly '{assembly}'{Environment.NewLine}{e.Message}{Environment.NewLine}{e}");
Environment.Exit (1);
}
}
Expand All @@ -168,7 +191,7 @@ void CreateJavaVM (string jvmDllPath)
try {
builder.CreateJreVM ();
} catch (Exception e) {
Error ($"Unable to create Java VM\n{e}");
Error ($"Unable to create Java VM{Environment.NewLine}{e}");
Environment.Exit (3);
}
}
Expand Down