modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/Main.java

rev 9619 : imported patch 9-jake-fxpackager.patch

*** 1,7 ****
  /*
!  * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 227,236 ****
--- 227,239 ----
  
                  } else if (args[0].equalsIgnoreCase("-deploy")) {
                      boolean srcfilesSet = false;
                      File templateInFile = null;
                      File templateOutFile = null;
+                     deployParams.setBundleType(BundleType.JNLP);
+                     deployParams.setTargetFormat("jnlp");
+ 
  
                      //can only set it to true with command line, reset default
                      deployParams.setEmbedJNLP(false);
                      for (int i = 1; i < args.length; i++) {
                          String arg = args[i];
*** 272,282 ****
                                  } else if ("installer".equals(v)) {
                                      type = BundleType.INSTALLER;
                                  } else {
                                      //assume it is request to build only specific format
                                      // (like exe or msi)
-                                     type = BundleType.INSTALLER;
                                      format = (v != null) ? v.toLowerCase() : null;
                                  }
                              }
                              deployParams.setBundleType(type);
                              deployParams.setTargetFormat(format);
--- 275,284 ----
*** 336,345 ****
--- 338,373 ----
                              srcfilesSet = true;
                          } else if (arg.equalsIgnoreCase("-argument")) {
                              addArgument(deployParams, nextArg(args, i++));
                          } else if (arg.equalsIgnoreCase("-nosign")) {
                              deployParams.setSignBundle(false);
+                         } else if (arg.equals("-addmods")) {
+                             deployParams.addModules.add(nextArg(args, i++));
+                         } else if (arg.equals("-limitmods")) {
+                             deployParams.limitModules.add(nextArg(args, i++));
+                         } else if (arg.equals("-detectmods")) {
+                             deployParams.detectModules = true;
+                         } else if (arg.equals("-stripexecutables")) {
+                             deployParams.stripExecutables = true;
+                         } else if (arg.equals("-modulepath")) {
+                             if (deployParams.modulePath == null) {
+                                 deployParams.modulePath = nextArg(args, i++);
+                             } else {
+                                 deployParams.modulePath =
+                                         deployParams.modulePath
+                                         + File.pathSeparator
+                                         + nextArg(args, i++);
+                             }
+                         } else if (arg.equals("-jdkmodulepath")) {
+                             if (deployParams.jdkModulePath == null) {
+                                 deployParams.jdkModulePath = nextArg(args, i++);
+                             } else {
+                                 deployParams.jdkModulePath =
+                                         deployParams.jdkModulePath
+                                         + File.pathSeparator
+                                         + nextArg(args, i++);
+                             }
                          } else {
                              throw new PackagerException("ERR_UnknownArgument", arg);
                          }
                      }
                      if (templateInFile != null) {