Skip to content

[GR-33359] Fix image name argument parsing when combined with -m option #3622

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 2 commits into from
Sep 1, 2021
Merged

[GR-33359] Fix image name argument parsing when combined with -m option #3622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07df2c2
Fix image name argument parsing when combined with -m option
Jul 23, 2021
22fe9eb
Ensure that only overrules are skipped when --module option is present
Aug 31, 2021
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
1 change: 1 addition & 0 deletions substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/DefaultOptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ public boolean consume(ArgumentQueue args) {
nativeImage.addPlainImageBuilderArg(nativeImage.oHClass + mainClassModuleArgParts[1]);
}
nativeImage.addPlainImageBuilderArg(nativeImage.oHModule + mainClassModuleArgParts[0]);
nativeImage.setModuleOptionMode(true);
return true;
case "--configurations-path":
args.poll();
Expand Down
7 changes: 6 additions & 1 deletion substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ private static <T> String oR(OptionKey<T> option) {
private boolean diagnostics = false;
String diagnosticsDir;
private boolean jarOptionMode = false;
private boolean moduleOptionMode = false;
private boolean dryRun = false;
private String printFlagsOptionQuery = null;
private String printFlagsWithExtraHelpOptionQuery = null;
Expand Down Expand Up @@ -1177,7 +1178,7 @@ private int completeImageBuild() {
String moduleMsg = USE_NI_JPMS ? " (or <module>/<mainclass>)" : "";
showError("Please specify class" + moduleMsg + " containing the main entry point method. (see --help)");
}
} else {
} else if (!moduleOptionMode) {
/* extraImageArgs main-class overrules previous main-class specification */
explicitMainClass = true;
mainClass = extraImageArgs.remove(0);
Expand Down Expand Up @@ -1783,6 +1784,10 @@ void setJarOptionMode(boolean val) {
jarOptionMode = val;
}

void setModuleOptionMode(boolean val) {
moduleOptionMode = val;
}

boolean isVerbose() {
return verbose;
}
Expand Down
3 changes: 3 additions & 0 deletions ...atevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,9 @@ private int buildImage(String[] arguments, ImageClassLoader classLoader) {
.orElseThrow(() -> UserError.abort("module %s does not have a ModuleMainClass attribute, use -m <module>/<main-class>", moduleName));
}
mainClass = classLoader.forName(className, mainModule);
if (mainClass == null) {
throw UserError.abort("Main entry point class '%s' not found.", className);
}
} catch (ClassNotFoundException ex) {
throw UserError.abort("Main entry point class '%s' not found.", className);
}
Expand Down