jdk-sandbox: comparison src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java

equal deleted inserted replaced

-:e7ba8c89abe7
+:fa68c2ab636d
 private static final ResourceBundle I18N = ResourceBundle.getBundle(
 "jdk.jpackage.internal.resources.MainResources");
 private static final String IMAGE_MODE = "image";
 private static final String INSTALLER_MODE = "installer";
-private static final String JRE_INSTALLER_MODE = "jre-installer";
 private static final String FA_EXTENSIONS = "extension";
 private static final String FA_CONTENT_TYPE = "mime-type";
 private static final String FA_DESCRIPTION = "description";
 private static final String FA_ICON = "icon";
 Boolean.class,
 p -> Boolean.FALSE,
 (s, p) -> (s == null || "null".equalsIgnoreCase(s)) ?
 true : Boolean.valueOf(s));
-public static final BundlerParamInfo<Boolean> CREATE_JRE_INSTALLER =
-new StandardBundlerParam<>(
-I18N.getString("param.create-jre-installer.name"),
-I18N.getString("param.create-jre-installer.description"),
-JRE_INSTALLER_MODE,
-Boolean.class,
-p -> Boolean.FALSE,
-(s, p) -> (s == null || "null".equalsIgnoreCase(s)) ?
-true : Boolean.valueOf(s));
 // regexp for parsing args (for example, for secondary launchers)
 private static Pattern pattern = Pattern.compile(
 "(?:(?:([\"'])(?:\\\\\\1|.)*?(?:\\1|$))|(?:\\\\[\"'\\s]|[^\\s]))++");
 private DeployParams deployParams = null;
 private boolean retainBuildRoot = false;
 private String buildRoot = null;
 private String mainJarPath = null;
-private static boolean jreInstaller = false;
+private static boolean runtimeInstaller = false;
 private List<jdk.jpackage.internal.Bundler> platformBundlers = null;
 private List<SecondaryLauncherArguments> secondaryLaunchers = null;
 CREATE_INSTALLER(INSTALLER_MODE, OptionCategories.MODE, () -> {
 setOptionValue(INSTALLER_MODE, true);
 context().bundleType = BundlerType.INSTALLER;
 String format = "installer";
-if (hasNextArg()) {
-String arg = popArg();
-if (!arg.startsWith("-")) {
-format = arg.toLowerCase();
-context().hasTargetFormat = true;
-} else {
-prevArg();
-}
-}
 context().deployParams.setTargetFormat(format);
 }),
-CREATE_JRE_INSTALLER(JRE_INSTALLER_MODE, OptionCategories.MODE, () -> {
+RUNTIME_INSTALLER("runtime-installer",
-setOptionValue(JRE_INSTALLER_MODE, true);
+OptionCategories.PROPERTY, () -> {
-context().bundleType = BundlerType.INSTALLER;
+runtimeInstaller = true;
-String format = "installer";
+setOptionValue("runtime-installer", true);
-if (hasNextArg()) {
+}),
-String arg = popArg();
-if (!arg.startsWith("-")) {
+INSTALLER_TYPE("installer-type", OptionCategories.PROPERTY, () -> {
-format = arg.toLowerCase();
+String type = popArg();
-context().hasTargetFormat = true;
+context().deployParams.setTargetFormat(type);
-} else {
+context().hasTargetFormat = true;
-prevArg();
+setOptionValue("installer-type", type);
-}
-}
-jreInstaller = true;
-context().deployParams.setTargetFormat(format);
-context().deployParams.setJreInstaller(true);
 }),
 INPUT ("input", "i", OptionCategories.PROPERTY, () -> {
 context().input = popArg();
 setOptionValue("input", context().input);
 DESCRIPTION ("description", "d", OptionCategories.PROPERTY),
 VENDOR ("vendor", OptionCategories.PROPERTY),
-APPCLASS ("class", "c", OptionCategories.PROPERTY, () -> {
+APPCLASS ("main-class", "c", OptionCategories.PROPERTY, () -> {
 context().hasMainClass = true;
-setOptionValue("class", popArg());
+setOptionValue("main-class", popArg());
 }),
 NAME ("name", "n", OptionCategories.PROPERTY),
 IDENTIFIER ("identifier", OptionCategories.PROPERTY),
 VERBOSE ("verbose", OptionCategories.PROPERTY, () -> {
 setOptionValue("verbose", true);
 Log.setVerbose(true);
 }),
-FORCE ("force", OptionCategories.PROPERTY, () -> {
+OVERWRITE ("overwrite", OptionCategories.PROPERTY, () -> {
-setOptionValue("force", true);
+setOptionValue("overwrite", true);
 }),
 RESOURCE_DIR("resource-dir",
 OptionCategories.PROPERTY, () -> {
 String resourceDir = popArg();
 }),
 ADD_MODULES ("add-modules", OptionCategories.MODULAR),
 MODULE_PATH ("module-path", "p", OptionCategories.MODULAR),
-LIMIT_MODULES ("limit-modules", OptionCategories.MODULAR),
 MAC_SIGN ("mac-sign", "s", OptionCategories.PLATFORM_MAC, () -> {
 setOptionValue("mac-sign", true);
 }),
 args.add(qsplit[i]);
 }
 }
 }
 } else {
-Log.error("Can not find argument file: " + f);
+Log.info(MessageFormat.format(I18N.getString(
+"warning.missing.arg.file"), f));
 }
 } catch (IOException ioe) {
 Log.verbose(ioe.getMessage());
 Log.verbose(ioe);
 }
 }
 }
 if (allOptions.isEmpty() || !allOptions.get(0).isMode()) {
 // first argument should always be a mode.
-Log.error("ERROR: Mode is not specified");
+throw new PackagerException("ERR_MissingMode");
-return false;
+}
-}
+if (hasMainJar && !hasMainClass) {
-if (!hasAppImage && !hasMainJar && !hasMainModule &&
-!hasMainClass && !jreInstaller) {
-Log.error("ERROR: Main jar, main class, main module, "
-+ "or app-image must be specified.");
-} else if (!hasMainModule && !hasMainClass) {
 // try to get main-class from manifest
 String mainClass = getMainClassFromManifest();
 if (mainClass != null) {
 CLIOptions.setOptionValue(
 CLIOptions.APPCLASS.getId(), mainClass);
 throw new PackagerException("ERR_NoUniqueName");
 }
 }
 usedNames.add(slName);
 }
-if (jreInstaller && bp.getName() == null) {
+if (runtimeInstaller && bp.getName() == null) {
 throw new PackagerException("ERR_NoJreInstallerName");
 }
 return generateBundle(bp.getBundleParamsAsMap());
 } catch (Exception e) {
 if (hasTargetFormat && deployParams.getTargetFormat() != null &&
 !deployParams.getTargetFormat().equalsIgnoreCase(
 bundler.getID())) {
 continue;
 }
-if (bundler.supported()) {
+if (bundler.supported(runtimeInstaller)) {
 platformBundlers.add(bundler);
 }
 }
 return platformBundlers;
 }
 } catch (IOException ignore) {}
 return null;
 }
-static boolean isJreInstaller() {
-return jreInstaller;
-}
 }

branch	JDK-8200758-branch
changeset 57150	fa68c2ab636d
parent 57140	3dcb33ce7ced
child 57151	38d0b67617e3