< prev index next >
src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java
Print this page
@@ -362,14 +362,10 @@
// then we need some resources and a main class
if (!hasModule && !hasAppImage && !runtimeInstaller) {
if (resources.isEmpty()) {
throw new PackagerException("ERR_MissingAppResources");
}
- if (!hasClass) {
- throw new PackagerException("ERR_MissingArgument",
- "--main-class");
- }
if (!hasMain) {
throw new PackagerException("ERR_MissingArgument",
"--main-jar");
}
}
@@ -453,11 +449,11 @@
return arch;
}
static final Set<String> multi_args = new TreeSet<>(Arrays.asList(
- StandardBundlerParam.JVM_OPTIONS.getID(),
+ StandardBundlerParam.JAVA_OPTIONS.getID(),
StandardBundlerParam.ARGUMENTS.getID(),
StandardBundlerParam.MODULE_PATH.getID(),
StandardBundlerParam.ADD_MODULES.getID(),
StandardBundlerParam.LIMIT_MODULES.getID(),
StandardBundlerParam.FILE_ASSOCIATIONS.getID()
@@ -467,11 +463,18 @@
public void addBundleArgument(String key, Object value) {
// special hack for multi-line arguments
if (multi_args.contains(key)) {
Object existingValue = bundlerArguments.get(key);
if (existingValue instanceof String && value instanceof String) {
- bundlerArguments.put(key, existingValue + "\n\n" + value);
+ String delim = "\n\n";
+ if (key.equals(StandardBundlerParam.MODULE_PATH.getID())) {
+ delim = File.pathSeparator;
+ } else if (key.equals(
+ StandardBundlerParam.ADD_MODULES.getID())) {
+ delim = ",";
+ }
+ bundlerArguments.put(key, existingValue + delim + value);
} else if (existingValue instanceof List && value instanceof List) {
((List)existingValue).addAll((List)value);
} else if (existingValue instanceof Map &&
value instanceof String && ((String)value).contains("=")) {
String[] mapValues = ((String)value).split("=", 2);
@@ -488,12 +491,10 @@
BundleParams bundleParams = new BundleParams();
// construct app resources relative to output folder!
bundleParams.setAppResourcesList(resources);
- bundleParams.setIdentifier(id);
-
bundleParams.setApplicationClass(applicationClass);
bundleParams.setAppVersion(version);
bundleParams.setType(bundleType);
bundleParams.setBundleFormat(targetFormat);
bundleParams.setVendor(vendor);
< prev index next >