--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/Main.java 2017-04-27 09:19:41.000000000 -0700 +++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/Main.java 2017-04-27 09:19:40.000000000 -0700 @@ -52,7 +52,7 @@ + " " + PackagerLib.JAVAFX_VERSION + "\n"; private static final String help = bundle.getString("MSG_Help_1") + bundle.getString("MSG_Help_2") - + bundle.getString("MSG_Help_3") + + MessageFormat.format(bundle.getString("MSG_Help_3"), File.pathSeparator) + bundle.getString("MSG_Help_4") + bundle.getString("MSG_Help_5") + bundle.getString("MSG_Help_6") @@ -67,8 +67,6 @@ private static boolean genJNLP = false; private static boolean genPackages = false; private static boolean css2Bin = false; - private static boolean signJar = false; - private static boolean makeAll = false; private static void addResources(CommonParams commonParams, String srcdir, String srcfiles) { @@ -408,59 +406,6 @@ addResources(createBssParams, srcdir, srcfiles); css2Bin = true; - } else if (args[0].equalsIgnoreCase("-signJar")) { - Log.info("Warning: -signJar has been deprecated and will be removed in a future release."); - for (int i = 1; i < args.length; i++) { - String arg = args[i]; - if (arg.equalsIgnoreCase("-keyStore")) { - signJarParams.setKeyStore(new File(nextArg(args, i++))); - } else if(arg.equalsIgnoreCase("-alias")) { - signJarParams.setAlias(nextArg(args, i++)); - } else if(arg.equalsIgnoreCase("-storePass")) { - signJarParams.setStorePass(nextArg(args, i++)); - } else if(arg.equalsIgnoreCase("-keyPass")) { - signJarParams.setKeyPass(nextArg(args, i++)); - } else if(arg.equalsIgnoreCase("-storeType")) { - signJarParams.setStoreType(nextArg(args, i++)); - } else if(arg.equalsIgnoreCase("-verbose") || arg.equalsIgnoreCase("-v")) { - signJarParams.setVerbose(true); - verbose = true; - } else if (arg.equalsIgnoreCase("-outdir")) { - signJarParams.setOutdir(new File(nextArg(args, i++))); - } else if (arg.equalsIgnoreCase("-srcdir")) { - srcdir = nextArg(args, i++); - } else if (arg.equalsIgnoreCase("-srcfiles")) { - srcfiles = nextArg(args, i++); - } else { - throw new PackagerException("ERR_UnknownArgument", arg); - } - } - - addResources(signJarParams, srcdir, srcfiles); - signJar = true; - } else if (args[0].equalsIgnoreCase("-makeall")) { - System.err.println("-makeall is deprecated"); - for (int i = 1; i < args.length; i++) { - String arg = args[i]; - if (arg.equalsIgnoreCase("-appclass")) { - makeAllParams.setAppClass(nextArg(args, i++)); - } else if (arg.equalsIgnoreCase("-preloader")) { - makeAllParams.setPreloader(nextArg(args, i++)); - } else if (arg.equalsIgnoreCase("-classpath")) { - makeAllParams.setClasspath(nextArg(args, i++)); - } else if (arg.equalsIgnoreCase("-name")) { - makeAllParams.setAppName(nextArg(args, i++)); - } else if(arg.equalsIgnoreCase("-width")) { - makeAllParams.setWidth(Integer.parseInt(nextArg(args, i++))); - } else if(arg.equalsIgnoreCase("-height")) { - makeAllParams.setHeight(Integer.parseInt(nextArg(args, i++))); - } else if(arg.equalsIgnoreCase("-v")) { - makeAllParams.setVerbose(true); - } else { - throw new PackagerException("ERR_UnknownArgument", arg); - } - } - makeAll = true; } else if (args[0].equalsIgnoreCase("-help")) { showBundlerHelp(args[1], args.length > 2 && "-verbose".equals(args[2])); } else { @@ -495,31 +440,6 @@ deployParams.validate(); packager.generateDeploymentPackages(deployParams); } - if (signJar) { - signJarParams.validate(); - if (signJarParams.storePass == null) { - char[] passwd = System.console().readPassword(bundle.getString("MSG_EnterKeystorePassword")); - if (passwd == null) { - signJarParams.storePass = ""; - } else { - signJarParams.storePass = new String(passwd); - } - } - if (signJarParams.keyPass == null) { - char[] passwd = System.console().readPassword(bundle.getString("MSG_EnterKeyPassword"), signJarParams.alias); - if (passwd == null) { - signJarParams.keyPass = ""; - } else { - signJarParams.keyPass = new String(passwd); - } - } - packager.signJar(signJarParams); - } - if (makeAll) { - makeAllParams.validate(); - packager.makeAll(makeAllParams); - } - } catch (Exception e) { if (verbose) { throw e; --- old/modules/jdk.packager/src/main/resources/com/sun/javafx/tools/packager/Bundle.properties 2017-04-27 09:19:42.000000000 -0700 +++ new/modules/jdk.packager/src/main/resources/com/sun/javafx/tools/packager/Bundle.properties 2017-04-27 09:19:42.000000000 -0700 @@ -75,7 +75,7 @@ \ to execute if not specified by the module\n\ \ -p \n\ \ --module-path ...\n\ -\ A : separated list of directories, each directory\n\ +\ A {0} separated list of directories, each directory\n\ \ is a directory of modules.\n\ \ --add-modules [,...]\n\ \ root modules to resolve in addition to the initial module\n\ @@ -169,16 +169,13 @@ \n MSG_Help_7=Sample usages:\n\ --------------\n\ -javapackager -createjar -appclass package.ClassName \n\ -\ -srcdir classes -outdir out -outfile outjar -v\n\ -\ Packages the content of the classes directory to outjar.jar,\n\ -\ sets the application class to package.ClassName.\n\ -javapackager -deploy -outdir outdir -outfile outfile -width 34 -height 43 \n\ +javapackager -deploy -native jnlp -outdir outdir -outfile outfile -width 34 -height 43 \n\ \ -name AppName -appclass package.ClassName -v -srcdir compiled\n\ \ Generates outfile.jnlp and corresponding outfile.html files in \n\ \ outdir for aplication AppName that is started by package.ClassName\n\ -\ class and has dimensions of 34x43. - +\ class and has dimensions of 34x43.\n\ +javapackager -deploy -native native -outdir outdir -name AppName -m modulename/mainclass\n\ +\ Generates a native image and all native installers. ERR_UnknownArgument=Error: Unknown argument: {0} ERR_UnknownCommand=Error: Unknown command: {0}