--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java Tue Sep 10 09:18:19 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java Tue Sep 10 14:57:03 2019 -0400
@@ -52,7 +52,7 @@
final List<RelativeFileSet> resources = new ArrayList<>();
- String targetFormat = null; // means app-image
+ String targetFormat = null; // means default type for this platform
File outdir = null;
@@ -197,10 +197,10 @@
Arguments.CLIOptions.INPUT.getId()) != null);
boolean hasModulePath = (bundlerArguments.get(
Arguments.CLIOptions.MODULE_PATH.getId()) != null);
- boolean runtimeInstaller = targetFormat != null &&
+ boolean runtimeInstaller = !isTargetAppImage() &&
!hasAppImage && !hasModule && !hasMain && hasRuntimeImage;
- if (targetFormat == null) {
+ if (isTargetAppImage()) {
// Module application requires --runtime-image or --module-path
if (hasModule) {
if (!hasModulePath && !hasRuntimeImage) {
@@ -285,6 +285,10 @@
return targetFormat;
}
+ boolean isTargetAppImage() {
+ return ("app-image".equals(targetFormat));
+ }
+
private static final Set<String> multi_args = new TreeSet<>(Arrays.asList(
StandardBundlerParam.JAVA_OPTIONS.getID(),
StandardBundlerParam.ARGUMENTS.getID(),