Skip to content

[GR-58542] Process --version, --help or --help-extra like java does. #9826

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

Closed
wants to merge 1 commit into from
Closed

[GR-58542] Process --version, --help or --help-extra like java does. #9826

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
12 changes: 0 additions & 12 deletions substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/CmdLineOptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,23 +76,17 @@ boolean consume(ArgumentQueue args) {
private boolean consume(ArgumentQueue args, String headArg) {
switch (headArg) {
case "--help":
args.poll();
singleArgumentCheck(args, headArg);
nativeImage.showMessage(HELP_TEXT);
nativeImage.showNewline();
nativeImage.apiOptionHandler.printOptions(nativeImage::showMessage, false);
nativeImage.showNewline();
System.exit(ExitStatus.OK.getValue());
return true;
case "--version":
args.poll();
singleArgumentCheck(args, headArg);
printVersion();
System.exit(ExitStatus.OK.getValue());
return true;
case "--help-extra":
args.poll();
singleArgumentCheck(args, headArg);
nativeImage.showMessage(HELP_EXTRA_TEXT);
nativeImage.apiOptionHandler.printOptions(nativeImage::showMessage, true);
nativeImage.showNewline();
Expand Down Expand Up @@ -235,12 +229,6 @@ private void printVersion() {
nativeImage.showMessage("%s%s (%sbuild %s, %s)", javaVMName, vendorVersion, jdkDebugLevel, javaVMVersion, javaVMInfo);
}

private static void singleArgumentCheck(ArgumentQueue args, String arg) {
if (!args.isEmpty()) {
NativeImage.showError("Option " + arg + " cannot be combined with other options.");
}
}

@Override
void addFallbackBuildArgs(List<String> buildArgs) {
if (nativeImage.isVerbose()) {
Expand Down