author | herrick |
Mon, 30 Sep 2019 15:59:50 -0400 | |
branch | JDK-8200758-branch |
changeset 58415 | 73f8e557549a |
parent 58304 | 7a61351edad2 |
child 58888 | d802578912f3 |
permissions | -rw-r--r-- |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1 |
/* |
57106
ea870b9ce89a
8216492: Update copyright of all new jpackage fils to 2019
kcr
parents:
57103
diff
changeset
|
2 |
* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
4 |
* |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. Oracle designates this |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
8 |
* particular file as subject to the "Classpath" exception as provided |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
10 |
* |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
15 |
* accompanied this code). |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
16 |
* |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
17 |
* You should have received a copy of the GNU General Public License version |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
20 |
* |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
22 |
* or visit www.oracle.com if you need additional information or have any |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
23 |
* questions. |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
24 |
*/ |
57039 | 25 |
package jdk.jpackage.internal; |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
26 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
27 |
import java.io.File; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
28 |
import java.io.FileInputStream; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
29 |
import java.io.IOException; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
30 |
import java.nio.file.Files; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
31 |
import java.nio.file.Path; |
58147
45a9084fe981
8230521: rename --output/-o option and add default value (".")
herrick
parents:
58116
diff
changeset
|
32 |
import java.nio.file.Paths; |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
33 |
import java.text.MessageFormat; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
34 |
import java.util.ArrayList; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
35 |
import java.util.Arrays; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
36 |
import java.util.Collection; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
37 |
import java.util.EnumSet; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
38 |
import java.util.HashMap; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
39 |
import java.util.HashSet; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
40 |
import java.util.List; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
41 |
import java.util.Map; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
42 |
import java.util.Set; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
43 |
import java.util.Properties; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
44 |
import java.util.ResourceBundle; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
45 |
import java.util.jar.Attributes; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
46 |
import java.util.jar.JarFile; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
47 |
import java.util.jar.Manifest; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
48 |
import java.util.stream.Stream; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
49 |
import java.util.regex.Matcher; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
50 |
import java.util.regex.Pattern; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
51 |
|
56994
b4aca2dbe2b5
8212537: Create method and class description comments for main functionality
herrick
parents:
56989
diff
changeset
|
52 |
/** |
b4aca2dbe2b5
8212537: Create method and class description comments for main functionality
herrick
parents:
56989
diff
changeset
|
53 |
* Arguments |
b4aca2dbe2b5
8212537: Create method and class description comments for main functionality
herrick
parents:
56989
diff
changeset
|
54 |
* |
b4aca2dbe2b5
8212537: Create method and class description comments for main functionality
herrick
parents:
56989
diff
changeset
|
55 |
* This class encapsulates and processes the command line arguments, |
57039 | 56 |
* in effect, implementing all the work of jpackage tool. |
56994
b4aca2dbe2b5
8212537: Create method and class description comments for main functionality
herrick
parents:
56989
diff
changeset
|
57 |
* |
b4aca2dbe2b5
8212537: Create method and class description comments for main functionality
herrick
parents:
56989
diff
changeset
|
58 |
* The primary entry point, processArguments(): |
b4aca2dbe2b5
8212537: Create method and class description comments for main functionality
herrick
parents:
56989
diff
changeset
|
59 |
* Processes and validates command line arguments, constructing DeployParams. |
b4aca2dbe2b5
8212537: Create method and class description comments for main functionality
herrick
parents:
56989
diff
changeset
|
60 |
* Validates the DeployParams, and generate the BundleParams. |
b4aca2dbe2b5
8212537: Create method and class description comments for main functionality
herrick
parents:
56989
diff
changeset
|
61 |
* Generates List of Bundlers from BundleParams valid for this platform. |
b4aca2dbe2b5
8212537: Create method and class description comments for main functionality
herrick
parents:
56989
diff
changeset
|
62 |
* Executes each Bundler in the list. |
b4aca2dbe2b5
8212537: Create method and class description comments for main functionality
herrick
parents:
56989
diff
changeset
|
63 |
*/ |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
64 |
public class Arguments { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
65 |
private static final ResourceBundle I18N = ResourceBundle.getBundle( |
57059 | 66 |
"jdk.jpackage.internal.resources.MainResources"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
67 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
68 |
private static final String FA_EXTENSIONS = "extension"; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
69 |
private static final String FA_CONTENT_TYPE = "mime-type"; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
70 |
private static final String FA_DESCRIPTION = "description"; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
71 |
private static final String FA_ICON = "icon"; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
72 |
|
57256 | 73 |
// regexp for parsing args (for example, for additional launchers) |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
74 |
private static Pattern pattern = Pattern.compile( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
75 |
"(?:(?:([\"'])(?:\\\\\\1|.)*?(?:\\1|$))|(?:\\\\[\"'\\s]|[^\\s]))++"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
76 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
77 |
private DeployParams deployParams = null; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
78 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
79 |
private int pos = 0; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
80 |
private List<String> argList = null; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
81 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
82 |
private List<CLIOptions> allOptions = null; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
83 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
84 |
private String input = null; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
85 |
private String output = null; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
86 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
87 |
private boolean hasMainJar = false; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
88 |
private boolean hasMainClass = false; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
89 |
private boolean hasMainModule = false; |
57151
38d0b67617e3
8217317: Create jpackage native library for windows
herrick
parents:
57150
diff
changeset
|
90 |
public boolean userProvidedBuildRoot = false; |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
91 |
|
57108 | 92 |
private String buildRoot = null; |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
93 |
private String mainJarPath = null; |
56957
2f01969ed7cb
8211299: Output of System.out is not printed to CMD on Windows
herrick
parents:
56933
diff
changeset
|
94 |
|
57150 | 95 |
private static boolean runtimeInstaller = false; |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
96 |
|
57256 | 97 |
private List<AddLauncherArguments> addLaunchers = null; |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
98 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
99 |
private static Map<String, CLIOptions> argIds = new HashMap<>(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
100 |
private static Map<String, CLIOptions> argShortIds = new HashMap<>(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
101 |
|
57276
eac9018748b3
8220804: Help message for @ argfile option is printed in the wrong place
herrick
parents:
57261
diff
changeset
|
102 |
static { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
103 |
// init maps for parsing arguments |
57276
eac9018748b3
8220804: Help message for @ argfile option is printed in the wrong place
herrick
parents:
57261
diff
changeset
|
104 |
(EnumSet.allOf(CLIOptions.class)).forEach(option -> { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
105 |
argIds.put(option.getIdWithPrefix(), option); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
106 |
if (option.getShortIdWithPrefix() != null) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
107 |
argShortIds.put(option.getShortIdWithPrefix(), option); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
108 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
109 |
}); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
110 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
111 |
|
57391 | 112 |
public Arguments(String[] args) { |
57276
eac9018748b3
8220804: Help message for @ argfile option is printed in the wrong place
herrick
parents:
57261
diff
changeset
|
113 |
argList = new ArrayList<String>(args.length); |
eac9018748b3
8220804: Help message for @ argfile option is printed in the wrong place
herrick
parents:
57261
diff
changeset
|
114 |
for (String arg : args) { |
eac9018748b3
8220804: Help message for @ argfile option is printed in the wrong place
herrick
parents:
57261
diff
changeset
|
115 |
argList.add(arg); |
eac9018748b3
8220804: Help message for @ argfile option is printed in the wrong place
herrick
parents:
57261
diff
changeset
|
116 |
} |
57776 | 117 |
Log.verbose ("\njpackage argument list: \n" + argList + "\n"); |
57276
eac9018748b3
8220804: Help message for @ argfile option is printed in the wrong place
herrick
parents:
57261
diff
changeset
|
118 |
pos = 0; |
eac9018748b3
8220804: Help message for @ argfile option is printed in the wrong place
herrick
parents:
57261
diff
changeset
|
119 |
|
eac9018748b3
8220804: Help message for @ argfile option is printed in the wrong place
herrick
parents:
57261
diff
changeset
|
120 |
deployParams = new DeployParams(); |
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
121 |
|
57276
eac9018748b3
8220804: Help message for @ argfile option is printed in the wrong place
herrick
parents:
57261
diff
changeset
|
122 |
allOptions = new ArrayList<>(); |
eac9018748b3
8220804: Help message for @ argfile option is printed in the wrong place
herrick
parents:
57261
diff
changeset
|
123 |
|
eac9018748b3
8220804: Help message for @ argfile option is printed in the wrong place
herrick
parents:
57261
diff
changeset
|
124 |
addLaunchers = new ArrayList<>(); |
58147
45a9084fe981
8230521: rename --output/-o option and add default value (".")
herrick
parents:
58116
diff
changeset
|
125 |
|
45a9084fe981
8230521: rename --output/-o option and add default value (".")
herrick
parents:
58116
diff
changeset
|
126 |
output = Paths.get("").toAbsolutePath().toString(); |
45a9084fe981
8230521: rename --output/-o option and add default value (".")
herrick
parents:
58116
diff
changeset
|
127 |
deployParams.setOutput(new File(output)); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
128 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
129 |
|
57067
9c17d779808e
8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents:
57065
diff
changeset
|
130 |
// CLIOptions is public for DeployParamsTest |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
131 |
public enum CLIOptions { |
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
132 |
PACKAGE_TYPE("package-type", OptionCategories.PROPERTY, () -> { |
58114
42df7de58e39
8230519: jpackage "--package-type" values and default
herrick
parents:
57909
diff
changeset
|
133 |
context().deployParams.setTargetFormat(popArg()); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
134 |
}), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
135 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
136 |
INPUT ("input", "i", OptionCategories.PROPERTY, () -> { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
137 |
context().input = popArg(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
138 |
setOptionValue("input", context().input); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
139 |
}), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
140 |
|
58147
45a9084fe981
8230521: rename --output/-o option and add default value (".")
herrick
parents:
58116
diff
changeset
|
141 |
OUTPUT ("dest", "d", OptionCategories.PROPERTY, () -> { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
142 |
context().output = popArg(); |
56994
b4aca2dbe2b5
8212537: Create method and class description comments for main functionality
herrick
parents:
56989
diff
changeset
|
143 |
context().deployParams.setOutput(new File(context().output)); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
144 |
}), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
145 |
|
58147
45a9084fe981
8230521: rename --output/-o option and add default value (".")
herrick
parents:
58116
diff
changeset
|
146 |
DESCRIPTION ("description", OptionCategories.PROPERTY), |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
147 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
148 |
VENDOR ("vendor", OptionCategories.PROPERTY), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
149 |
|
57256 | 150 |
APPCLASS ("main-class", OptionCategories.PROPERTY, () -> { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
151 |
context().hasMainClass = true; |
57150 | 152 |
setOptionValue("main-class", popArg()); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
153 |
}), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
154 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
155 |
NAME ("name", "n", OptionCategories.PROPERTY), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
156 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
157 |
VERBOSE ("verbose", OptionCategories.PROPERTY, () -> { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
158 |
setOptionValue("verbose", true); |
57776 | 159 |
Log.setVerbose(); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
160 |
}), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
161 |
|
57091
06bc4bd64599
8215515: Add a command line option to override internal resources.
herrick
parents:
57071
diff
changeset
|
162 |
RESOURCE_DIR("resource-dir", |
06bc4bd64599
8215515: Add a command line option to override internal resources.
herrick
parents:
57071
diff
changeset
|
163 |
OptionCategories.PROPERTY, () -> { |
06bc4bd64599
8215515: Add a command line option to override internal resources.
herrick
parents:
57071
diff
changeset
|
164 |
String resourceDir = popArg(); |
06bc4bd64599
8215515: Add a command line option to override internal resources.
herrick
parents:
57071
diff
changeset
|
165 |
setOptionValue("resource-dir", resourceDir); |
06bc4bd64599
8215515: Add a command line option to override internal resources.
herrick
parents:
57071
diff
changeset
|
166 |
}), |
57021
441c020bf626
8213324:jpackager deletes existing app directory without warning
herrick
parents:
57020
diff
changeset
|
167 |
|
57256 | 168 |
ARGUMENTS ("arguments", OptionCategories.PROPERTY, () -> { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
169 |
List<String> arguments = getArgumentList(popArg()); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
170 |
setOptionValue("arguments", arguments); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
171 |
}), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
172 |
|
57256 | 173 |
ICON ("icon", OptionCategories.PROPERTY), |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
174 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
175 |
COPYRIGHT ("copyright", OptionCategories.PROPERTY), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
176 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
177 |
LICENSE_FILE ("license-file", OptionCategories.PROPERTY), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
178 |
|
57071 | 179 |
VERSION ("app-version", OptionCategories.PROPERTY), |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
180 |
|
57741
38856ef4a19c
8229138: Add --linux-app-release option for DEB and RPM packages
herrick
parents:
57450
diff
changeset
|
181 |
RELEASE ("linux-app-release", OptionCategories.PROPERTY), |
38856ef4a19c
8229138: Add --linux-app-release option for DEB and RPM packages
herrick
parents:
57450
diff
changeset
|
182 |
|
57291 | 183 |
JAVA_OPTIONS ("java-options", OptionCategories.PROPERTY, () -> { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
184 |
List<String> args = getArgumentList(popArg()); |
57291 | 185 |
args.forEach(a -> setOptionValue("java-options", a)); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
186 |
}), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
187 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
188 |
FILE_ASSOCIATIONS ("file-associations", |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
189 |
OptionCategories.PROPERTY, () -> { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
190 |
Map<String, ? super Object> args = new HashMap<>(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
191 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
192 |
// load .properties file |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
193 |
Map<String, String> initialMap = getPropertiesFromFile(popArg()); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
194 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
195 |
String ext = initialMap.get(FA_EXTENSIONS); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
196 |
if (ext != null) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
197 |
args.put(StandardBundlerParam.FA_EXTENSIONS.getID(), ext); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
198 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
199 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
200 |
String type = initialMap.get(FA_CONTENT_TYPE); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
201 |
if (type != null) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
202 |
args.put(StandardBundlerParam.FA_CONTENT_TYPE.getID(), type); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
203 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
204 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
205 |
String desc = initialMap.get(FA_DESCRIPTION); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
206 |
if (desc != null) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
207 |
args.put(StandardBundlerParam.FA_DESCRIPTION.getID(), desc); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
208 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
209 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
210 |
String icon = initialMap.get(FA_ICON); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
211 |
if (icon != null) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
212 |
args.put(StandardBundlerParam.FA_ICON.getID(), icon); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
213 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
214 |
|
56836
40abf95122b0
8207143: jpackager fails to parse file associations
herrick
parents:
56821
diff
changeset
|
215 |
ArrayList<Map<String, ? super Object>> associationList = |
40abf95122b0
8207143: jpackager fails to parse file associations
herrick
parents:
56821
diff
changeset
|
216 |
new ArrayList<Map<String, ? super Object>>(); |
40abf95122b0
8207143: jpackager fails to parse file associations
herrick
parents:
56821
diff
changeset
|
217 |
|
40abf95122b0
8207143: jpackager fails to parse file associations
herrick
parents:
56821
diff
changeset
|
218 |
associationList.add(args); |
40abf95122b0
8207143: jpackager fails to parse file associations
herrick
parents:
56821
diff
changeset
|
219 |
|
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
220 |
// check that we really add _another_ value to the list |
56836
40abf95122b0
8207143: jpackager fails to parse file associations
herrick
parents:
56821
diff
changeset
|
221 |
setOptionValue("file-associations", associationList); |
40abf95122b0
8207143: jpackager fails to parse file associations
herrick
parents:
56821
diff
changeset
|
222 |
|
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
223 |
}), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
224 |
|
57256 | 225 |
ADD_LAUNCHER ("add-launcher", |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
226 |
OptionCategories.PROPERTY, () -> { |
57330
a30edd277572
8222733: Modify jpackage option --add-launcher synta
herrick
parents:
57314
diff
changeset
|
227 |
String spec = popArg(); |
a30edd277572
8222733: Modify jpackage option --add-launcher synta
herrick
parents:
57314
diff
changeset
|
228 |
String name = null; |
a30edd277572
8222733: Modify jpackage option --add-launcher synta
herrick
parents:
57314
diff
changeset
|
229 |
String filename = spec; |
a30edd277572
8222733: Modify jpackage option --add-launcher synta
herrick
parents:
57314
diff
changeset
|
230 |
if (spec.contains("=")) { |
a30edd277572
8222733: Modify jpackage option --add-launcher synta
herrick
parents:
57314
diff
changeset
|
231 |
String[] values = spec.split("=", 2); |
a30edd277572
8222733: Modify jpackage option --add-launcher synta
herrick
parents:
57314
diff
changeset
|
232 |
name = values[0]; |
a30edd277572
8222733: Modify jpackage option --add-launcher synta
herrick
parents:
57314
diff
changeset
|
233 |
filename = values[1]; |
a30edd277572
8222733: Modify jpackage option --add-launcher synta
herrick
parents:
57314
diff
changeset
|
234 |
} |
57256 | 235 |
context().addLaunchers.add( |
57330
a30edd277572
8222733: Modify jpackage option --add-launcher synta
herrick
parents:
57314
diff
changeset
|
236 |
new AddLauncherArguments(name, filename)); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
237 |
}), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
238 |
|
58115 | 239 |
TEMP_ROOT ("temp", OptionCategories.PROPERTY, () -> { |
57096
d06bec27f8c9
8215903: modify behavior of retaining temporary output dir
herrick
parents:
57091
diff
changeset
|
240 |
context().buildRoot = popArg(); |
57151
38d0b67617e3
8217317: Create jpackage native library for windows
herrick
parents:
57150
diff
changeset
|
241 |
context().userProvidedBuildRoot = true; |
58115 | 242 |
setOptionValue("temp", context().buildRoot); |
57096
d06bec27f8c9
8215903: modify behavior of retaining temporary output dir
herrick
parents:
57091
diff
changeset
|
243 |
}), |
56957
2f01969ed7cb
8211299: Output of System.out is not printed to CMD on Windows
herrick
parents:
56933
diff
changeset
|
244 |
|
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
245 |
INSTALL_DIR ("install-dir", OptionCategories.PROPERTY), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
246 |
|
57392 | 247 |
PREDEFINED_APP_IMAGE ("app-image", OptionCategories.PROPERTY), |
56957
2f01969ed7cb
8211299: Output of System.out is not printed to CMD on Windows
herrick
parents:
56933
diff
changeset
|
248 |
|
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
249 |
PREDEFINED_RUNTIME_IMAGE ("runtime-image", OptionCategories.PROPERTY), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
250 |
|
57256 | 251 |
MAIN_JAR ("main-jar", OptionCategories.PROPERTY, () -> { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
252 |
context().mainJarPath = popArg(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
253 |
context().hasMainJar = true; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
254 |
setOptionValue("main-jar", context().mainJarPath); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
255 |
}), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
256 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
257 |
MODULE ("module", "m", OptionCategories.MODULAR, () -> { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
258 |
context().hasMainModule = true; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
259 |
setOptionValue("module", popArg()); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
260 |
}), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
261 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
262 |
ADD_MODULES ("add-modules", OptionCategories.MODULAR), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
263 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
264 |
MODULE_PATH ("module-path", "p", OptionCategories.MODULAR), |
56957
2f01969ed7cb
8211299: Output of System.out is not printed to CMD on Windows
herrick
parents:
56933
diff
changeset
|
265 |
|
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
266 |
MAC_SIGN ("mac-sign", "s", OptionCategories.PLATFORM_MAC, () -> { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
267 |
setOptionValue("mac-sign", true); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
268 |
}), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
269 |
|
58115 | 270 |
MAC_BUNDLE_NAME ("mac-package-name", OptionCategories.PLATFORM_MAC), |
56957
2f01969ed7cb
8211299: Output of System.out is not printed to CMD on Windows
herrick
parents:
56933
diff
changeset
|
271 |
|
58115 | 272 |
MAC_BUNDLE_IDENTIFIER("mac-package-identifier", |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
273 |
OptionCategories.PLATFORM_MAC), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
274 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
275 |
MAC_APP_STORE_CATEGORY ("mac-app-store-category", |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
276 |
OptionCategories.PLATFORM_MAC), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
277 |
|
58115 | 278 |
MAC_BUNDLE_SIGNING_PREFIX ("mac-package-signing-prefix", |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
279 |
OptionCategories.PLATFORM_MAC), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
280 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
281 |
MAC_SIGNING_KEY_NAME ("mac-signing-key-user-name", |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
282 |
OptionCategories.PLATFORM_MAC), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
283 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
284 |
MAC_SIGNING_KEYCHAIN ("mac-signing-keychain", |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
285 |
OptionCategories.PLATFORM_MAC), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
286 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
287 |
MAC_APP_STORE_ENTITLEMENTS ("mac-app-store-entitlements", |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
288 |
OptionCategories.PLATFORM_MAC), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
289 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
290 |
WIN_MENU_HINT ("win-menu", OptionCategories.PLATFORM_WIN, () -> { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
291 |
setOptionValue("win-menu", true); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
292 |
}), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
293 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
294 |
WIN_MENU_GROUP ("win-menu-group", OptionCategories.PLATFORM_WIN), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
295 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
296 |
WIN_SHORTCUT_HINT ("win-shortcut", |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
297 |
OptionCategories.PLATFORM_WIN, () -> { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
298 |
setOptionValue("win-shortcut", true); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
299 |
}), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
300 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
301 |
WIN_PER_USER_INSTALLATION ("win-per-user-install", |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
302 |
OptionCategories.PLATFORM_WIN, () -> { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
303 |
setOptionValue("win-per-user-install", false); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
304 |
}), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
305 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
306 |
WIN_DIR_CHOOSER ("win-dir-chooser", |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
307 |
OptionCategories.PLATFORM_WIN, () -> { |
56957
2f01969ed7cb
8211299: Output of System.out is not printed to CMD on Windows
herrick
parents:
56933
diff
changeset
|
308 |
setOptionValue("win-dir-chooser", true); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
309 |
}), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
310 |
|
57062
044e7a644ee3
8214575: Exe installers will install application to already existing instalation
herrick
parents:
57060
diff
changeset
|
311 |
WIN_UPGRADE_UUID ("win-upgrade-uuid", |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
312 |
OptionCategories.PLATFORM_WIN), |
56957
2f01969ed7cb
8211299: Output of System.out is not printed to CMD on Windows
herrick
parents:
56933
diff
changeset
|
313 |
|
2f01969ed7cb
8211299: Output of System.out is not printed to CMD on Windows
herrick
parents:
56933
diff
changeset
|
314 |
WIN_CONSOLE_HINT ("win-console", OptionCategories.PLATFORM_WIN, () -> { |
2f01969ed7cb
8211299: Output of System.out is not printed to CMD on Windows
herrick
parents:
56933
diff
changeset
|
315 |
setOptionValue("win-console", true); |
2f01969ed7cb
8211299: Output of System.out is not printed to CMD on Windows
herrick
parents:
56933
diff
changeset
|
316 |
}), |
2f01969ed7cb
8211299: Output of System.out is not printed to CMD on Windows
herrick
parents:
56933
diff
changeset
|
317 |
|
58115 | 318 |
LINUX_BUNDLE_NAME ("linux-package-name", |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
319 |
OptionCategories.PLATFORM_LINUX), |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
320 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
321 |
LINUX_DEB_MAINTAINER ("linux-deb-maintainer", |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
322 |
OptionCategories.PLATFORM_LINUX), |
57909
c7de06ed4b54
8229979: jpackage cleanup src files, help text, and javadoc
herrick
parents:
57807
diff
changeset
|
323 |
|
57790 | 324 |
LINUX_CATEGORY ("linux-app-category", |
325 |
OptionCategories.PLATFORM_LINUX), |
|
326 |
||
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
327 |
LINUX_RPM_LICENSE_TYPE ("linux-rpm-license-type", |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
328 |
OptionCategories.PLATFORM_LINUX), |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
329 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
330 |
LINUX_PACKAGE_DEPENDENCIES ("linux-package-deps", |
57256 | 331 |
OptionCategories.PLATFORM_LINUX), |
332 |
||
58116 | 333 |
LINUX_SHORTCUT_HINT ("linux-shortcut", |
334 |
OptionCategories.PLATFORM_LINUX, () -> { |
|
335 |
setOptionValue("linux-shortcut", true); |
|
336 |
}), |
|
337 |
||
57256 | 338 |
LINUX_MENU_GROUP ("linux-menu-group", OptionCategories.PLATFORM_LINUX); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
339 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
340 |
private final String id; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
341 |
private final String shortId; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
342 |
private final OptionCategories category; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
343 |
private final ArgAction action; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
344 |
private static Arguments argContext; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
345 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
346 |
private CLIOptions(String id, OptionCategories category) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
347 |
this(id, null, category, null); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
348 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
349 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
350 |
private CLIOptions(String id, String shortId, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
351 |
OptionCategories category) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
352 |
this(id, shortId, category, null); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
353 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
354 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
355 |
private CLIOptions(String id, |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
356 |
OptionCategories category, ArgAction action) { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
357 |
this(id, null, category, action); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
358 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
359 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
360 |
private CLIOptions(String id, String shortId, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
361 |
OptionCategories category, ArgAction action) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
362 |
this.id = id; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
363 |
this.shortId = shortId; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
364 |
this.action = action; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
365 |
this.category = category; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
366 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
367 |
|
57067
9c17d779808e
8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents:
57065
diff
changeset
|
368 |
static void setContext(Arguments context) { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
369 |
argContext = context; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
370 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
371 |
|
57151
38d0b67617e3
8217317: Create jpackage native library for windows
herrick
parents:
57150
diff
changeset
|
372 |
public static Arguments context() { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
373 |
if (argContext != null) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
374 |
return argContext; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
375 |
} else { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
376 |
throw new RuntimeException("Argument context is not set."); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
377 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
378 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
379 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
380 |
public String getId() { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
381 |
return this.id; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
382 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
383 |
|
57067
9c17d779808e
8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents:
57065
diff
changeset
|
384 |
String getIdWithPrefix() { |
57438
4a31db8d42bd
8226599: use code coverage results to remove dead code
herrick
parents:
57421
diff
changeset
|
385 |
return "--" + this.id; |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
386 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
387 |
|
57067
9c17d779808e
8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents:
57065
diff
changeset
|
388 |
String getShortIdWithPrefix() { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
389 |
return this.shortId == null ? null : "-" + this.shortId; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
390 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
391 |
|
57067
9c17d779808e
8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents:
57065
diff
changeset
|
392 |
void execute() { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
393 |
if (action != null) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
394 |
action.execute(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
395 |
} else { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
396 |
defaultAction(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
397 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
398 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
399 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
400 |
private void defaultAction() { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
401 |
context().deployParams.addBundleArgument(id, popArg()); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
402 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
403 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
404 |
private static void setOptionValue(String option, Object value) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
405 |
context().deployParams.addBundleArgument(option, value); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
406 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
407 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
408 |
private static String popArg() { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
409 |
nextArg(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
410 |
return (context().pos >= context().argList.size()) ? |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
411 |
"" : context().argList.get(context().pos); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
412 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
413 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
414 |
private static String getArg() { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
415 |
return (context().pos >= context().argList.size()) ? |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
416 |
"" : context().argList.get(context().pos); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
417 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
418 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
419 |
private static void nextArg() { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
420 |
context().pos++; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
421 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
422 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
423 |
private static boolean hasNextArg() { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
424 |
return context().pos < context().argList.size(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
425 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
426 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
427 |
|
57067
9c17d779808e
8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents:
57065
diff
changeset
|
428 |
enum OptionCategories { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
429 |
MODULAR, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
430 |
PROPERTY, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
431 |
PLATFORM_MAC, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
432 |
PLATFORM_WIN, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
433 |
PLATFORM_LINUX; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
434 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
435 |
|
57391 | 436 |
public boolean processArguments() { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
437 |
try { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
438 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
439 |
// init context of arguments |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
440 |
CLIOptions.setContext(this); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
441 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
442 |
// parse cmd line |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
443 |
String arg; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
444 |
CLIOptions option; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
445 |
for (; CLIOptions.hasNextArg(); CLIOptions.nextArg()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
446 |
arg = CLIOptions.getArg(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
447 |
if ((option = toCLIOption(arg)) != null) { |
57060 | 448 |
// found a CLI option |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
449 |
allOptions.add(option); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
450 |
option.execute(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
451 |
} else { |
57140 | 452 |
throw new PackagerException("ERR_InvalidOption", arg); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
453 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
454 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
455 |
|
57150 | 456 |
if (hasMainJar && !hasMainClass) { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
457 |
// try to get main-class from manifest |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
458 |
String mainClass = getMainClassFromManifest(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
459 |
if (mainClass != null) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
460 |
CLIOptions.setOptionValue( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
461 |
CLIOptions.APPCLASS.getId(), mainClass); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
462 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
463 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
464 |
|
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
465 |
// display error for arguments that are not supported |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
466 |
// for current configuration. |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
467 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
468 |
validateArguments(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
469 |
|
57450
82c78b40b39d
8227058: Regressions related to no longer setting user.dir
herrick
parents:
57438
diff
changeset
|
470 |
addResources(deployParams, input, mainJarPath); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
471 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
472 |
List<Map<String, ? super Object>> launchersAsMap = |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
473 |
new ArrayList<>(); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
474 |
|
57256 | 475 |
for (AddLauncherArguments sl : addLaunchers) { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
476 |
launchersAsMap.add(sl.getLauncherMap()); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
477 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
478 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
479 |
deployParams.addBundleArgument( |
57256 | 480 |
StandardBundlerParam.ADD_LAUNCHERS.getID(), |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
481 |
launchersAsMap); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
482 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
483 |
// at this point deployParams should be already configured |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
484 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
485 |
deployParams.validate(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
486 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
487 |
BundleParams bp = deployParams.getBundleParams(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
488 |
|
56958
8880b21d458d
8208578: Need to improve error handling of mandatory arguments
herrick
parents:
56957
diff
changeset
|
489 |
// validate name(s) |
8880b21d458d
8208578: Need to improve error handling of mandatory arguments
herrick
parents:
56957
diff
changeset
|
490 |
ArrayList<String> usedNames = new ArrayList<String>(); |
8880b21d458d
8208578: Need to improve error handling of mandatory arguments
herrick
parents:
56957
diff
changeset
|
491 |
usedNames.add(bp.getName()); // add main app name |
8880b21d458d
8208578: Need to improve error handling of mandatory arguments
herrick
parents:
56957
diff
changeset
|
492 |
|
57256 | 493 |
for (AddLauncherArguments sl : addLaunchers) { |
56958
8880b21d458d
8208578: Need to improve error handling of mandatory arguments
herrick
parents:
56957
diff
changeset
|
494 |
Map<String, ? super Object> slMap = sl.getLauncherMap(); |
56987 | 495 |
String slName = |
56958
8880b21d458d
8208578: Need to improve error handling of mandatory arguments
herrick
parents:
56957
diff
changeset
|
496 |
(String) slMap.get(Arguments.CLIOptions.NAME.getId()); |
8880b21d458d
8208578: Need to improve error handling of mandatory arguments
herrick
parents:
56957
diff
changeset
|
497 |
if (slName == null) { |
57256 | 498 |
throw new PackagerException("ERR_NoAddLauncherName"); |
57119 | 499 |
} |
57256 | 500 |
// same rules apply to additional launcher names as app name |
57119 | 501 |
DeployParams.validateName(slName, false); |
502 |
for (String usedName : usedNames) { |
|
503 |
if (slName.equals(usedName)) { |
|
504 |
throw new PackagerException("ERR_NoUniqueName"); |
|
56958
8880b21d458d
8208578: Need to improve error handling of mandatory arguments
herrick
parents:
56957
diff
changeset
|
505 |
} |
8880b21d458d
8208578: Need to improve error handling of mandatory arguments
herrick
parents:
56957
diff
changeset
|
506 |
} |
8880b21d458d
8208578: Need to improve error handling of mandatory arguments
herrick
parents:
56957
diff
changeset
|
507 |
usedNames.add(slName); |
8880b21d458d
8208578: Need to improve error handling of mandatory arguments
herrick
parents:
56957
diff
changeset
|
508 |
} |
57150 | 509 |
if (runtimeInstaller && bp.getName() == null) { |
56958
8880b21d458d
8208578: Need to improve error handling of mandatory arguments
herrick
parents:
56957
diff
changeset
|
510 |
throw new PackagerException("ERR_NoJreInstallerName"); |
8880b21d458d
8208578: Need to improve error handling of mandatory arguments
herrick
parents:
56957
diff
changeset
|
511 |
} |
8880b21d458d
8208578: Need to improve error handling of mandatory arguments
herrick
parents:
56957
diff
changeset
|
512 |
|
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
513 |
generateBundle(bp.getBundleParamsAsMap()); |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
514 |
return true; |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
515 |
} catch (Exception e) { |
56987 | 516 |
if (Log.isVerbose()) { |
57391 | 517 |
Log.verbose(e); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
518 |
} else { |
57261
13b6672477df
8220505: Allow building available installers when --installer-type not specified
herrick
parents:
57256
diff
changeset
|
519 |
String msg1 = e.getMessage(); |
13b6672477df
8220505: Allow building available installers when --installer-type not specified
herrick
parents:
57256
diff
changeset
|
520 |
Log.error(msg1); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
521 |
if (e.getCause() != null && e.getCause() != e) { |
57261
13b6672477df
8220505: Allow building available installers when --installer-type not specified
herrick
parents:
57256
diff
changeset
|
522 |
String msg2 = e.getCause().getMessage(); |
58301
e0efb29609bd
8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
58147
diff
changeset
|
523 |
if (msg2 != null && !msg1.contains(msg2)) { |
57261
13b6672477df
8220505: Allow building available installers when --installer-type not specified
herrick
parents:
57256
diff
changeset
|
524 |
Log.error(msg2); |
13b6672477df
8220505: Allow building available installers when --installer-type not specified
herrick
parents:
57256
diff
changeset
|
525 |
} |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
526 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
527 |
} |
57391 | 528 |
return false; |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
529 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
530 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
531 |
|
57256 | 532 |
private void validateArguments() throws PackagerException { |
58114
42df7de58e39
8230519: jpackage "--package-type" values and default
herrick
parents:
57909
diff
changeset
|
533 |
String type = deployParams.getTargetFormat(); |
42df7de58e39
8230519: jpackage "--package-type" values and default
herrick
parents:
57909
diff
changeset
|
534 |
String ptype = (type != null) ? type : "default"; |
42df7de58e39
8230519: jpackage "--package-type" values and default
herrick
parents:
57909
diff
changeset
|
535 |
boolean imageOnly = deployParams.isTargetAppImage(); |
57256 | 536 |
boolean hasAppImage = allOptions.contains( |
537 |
CLIOptions.PREDEFINED_APP_IMAGE); |
|
538 |
boolean hasRuntime = allOptions.contains( |
|
539 |
CLIOptions.PREDEFINED_RUNTIME_IMAGE); |
|
540 |
boolean installerOnly = !imageOnly && hasAppImage; |
|
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
541 |
runtimeInstaller = !imageOnly && hasRuntime && !hasAppImage && |
57256 | 542 |
!hasMainModule && !hasMainJar; |
543 |
||
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
544 |
for (CLIOptions option : allOptions) { |
57256 | 545 |
if (!ValidOptions.checkIfSupported(option)) { |
546 |
// includes option valid only on different platform |
|
547 |
throw new PackagerException("ERR_UnsupportedOption", |
|
548 |
option.getIdWithPrefix()); |
|
549 |
} |
|
550 |
if (imageOnly) { |
|
551 |
if (!ValidOptions.checkIfImageSupported(option)) { |
|
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
552 |
throw new PackagerException("ERR_InvalidTypeOption", |
58114
42df7de58e39
8230519: jpackage "--package-type" values and default
herrick
parents:
57909
diff
changeset
|
553 |
option.getIdWithPrefix(), type); |
57192 | 554 |
} |
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
555 |
} else if (installerOnly || runtimeInstaller) { |
57256 | 556 |
if (!ValidOptions.checkIfInstallerSupported(option)) { |
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
557 |
if (runtimeInstaller) { |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
558 |
throw new PackagerException("ERR_NoInstallerEntryPoint", |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
559 |
option.getIdWithPrefix()); |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
560 |
} else { |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
561 |
throw new PackagerException("ERR_InvalidTypeOption", |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
562 |
option.getIdWithPrefix(), ptype); |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
563 |
} |
57256 | 564 |
} |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
565 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
566 |
} |
57256 | 567 |
if (installerOnly && hasRuntime) { |
568 |
// note --runtime-image is only for image or runtime installer. |
|
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
569 |
throw new PackagerException("ERR_InvalidTypeOption", |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
570 |
CLIOptions.PREDEFINED_RUNTIME_IMAGE.getIdWithPrefix(), |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
571 |
ptype); |
57256 | 572 |
} |
573 |
if (hasMainJar && hasMainModule) { |
|
574 |
throw new PackagerException("ERR_BothMainJarAndModule"); |
|
575 |
} |
|
576 |
if (imageOnly && !hasMainJar && !hasMainModule) { |
|
577 |
throw new PackagerException("ERR_NoEntryPoint"); |
|
578 |
} |
|
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
579 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
580 |
|
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
581 |
private jdk.jpackage.internal.Bundler getPlatformBundler() { |
58114
42df7de58e39
8230519: jpackage "--package-type" values and default
herrick
parents:
57909
diff
changeset
|
582 |
boolean appImage = deployParams.isTargetAppImage(); |
42df7de58e39
8230519: jpackage "--package-type" values and default
herrick
parents:
57909
diff
changeset
|
583 |
String type = deployParams.getTargetFormat(); |
42df7de58e39
8230519: jpackage "--package-type" values and default
herrick
parents:
57909
diff
changeset
|
584 |
String bundleType = (appImage ? "IMAGE" : "INSTALLER"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
585 |
|
57039 | 586 |
for (jdk.jpackage.internal.Bundler bundler : |
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
587 |
Bundlers.createBundlersInstance().getBundlers(bundleType)) { |
58114
42df7de58e39
8230519: jpackage "--package-type" values and default
herrick
parents:
57909
diff
changeset
|
588 |
if (type == null) { |
42df7de58e39
8230519: jpackage "--package-type" values and default
herrick
parents:
57909
diff
changeset
|
589 |
if (bundler.isDefault() |
42df7de58e39
8230519: jpackage "--package-type" values and default
herrick
parents:
57909
diff
changeset
|
590 |
&& bundler.supported(runtimeInstaller)) { |
42df7de58e39
8230519: jpackage "--package-type" values and default
herrick
parents:
57909
diff
changeset
|
591 |
return bundler; |
42df7de58e39
8230519: jpackage "--package-type" values and default
herrick
parents:
57909
diff
changeset
|
592 |
} |
42df7de58e39
8230519: jpackage "--package-type" values and default
herrick
parents:
57909
diff
changeset
|
593 |
} else { |
42df7de58e39
8230519: jpackage "--package-type" values and default
herrick
parents:
57909
diff
changeset
|
594 |
if ((appImage || type.equalsIgnoreCase(bundler.getID())) |
42df7de58e39
8230519: jpackage "--package-type" values and default
herrick
parents:
57909
diff
changeset
|
595 |
&& bundler.supported(runtimeInstaller)) { |
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
596 |
return bundler; |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
597 |
} |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
598 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
599 |
} |
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
600 |
return null; |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
601 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
602 |
|
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
603 |
private void generateBundle(Map<String,? super Object> params) |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56836
diff
changeset
|
604 |
throws PackagerException { |
57103
fe6bf39ac415
8216373: temporary build-root left behind when using secondary launcher(s)
herrick
parents:
57099
diff
changeset
|
605 |
|
57062
044e7a644ee3
8214575: Exe installers will install application to already existing instalation
herrick
parents:
57060
diff
changeset
|
606 |
boolean bundleCreated = false; |
57103
fe6bf39ac415
8216373: temporary build-root left behind when using secondary launcher(s)
herrick
parents:
57099
diff
changeset
|
607 |
|
58115 | 608 |
// the temp dir needs to be fetched from the params early, |
57103
fe6bf39ac415
8216373: temporary build-root left behind when using secondary launcher(s)
herrick
parents:
57099
diff
changeset
|
609 |
// to prevent each copy of the params (such as may be used for |
58115 | 610 |
// additional launchers) from generating a separate temp dir when |
57103
fe6bf39ac415
8216373: temporary build-root left behind when using secondary launcher(s)
herrick
parents:
57099
diff
changeset
|
611 |
// the default is used (the default is a new temp directory) |
fe6bf39ac415
8216373: temporary build-root left behind when using secondary launcher(s)
herrick
parents:
57099
diff
changeset
|
612 |
// The bundler.cleanup() below would not otherwise be able to |
fe6bf39ac415
8216373: temporary build-root left behind when using secondary launcher(s)
herrick
parents:
57099
diff
changeset
|
613 |
// clean these extra (and unneeded) temp directories. |
57256 | 614 |
StandardBundlerParam.TEMP_ROOT.fetchFrom(params); |
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
615 |
|
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
616 |
// determine what bundler to run |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
617 |
jdk.jpackage.internal.Bundler bundler = getPlatformBundler(); |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
618 |
|
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
619 |
if (bundler == null) { |
57256 | 620 |
throw new PackagerException("ERR_InvalidInstallerType", |
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
621 |
deployParams.getTargetFormat()); |
57256 | 622 |
} |
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
623 |
|
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
624 |
Map<String, ? super Object> localParams = new HashMap<>(params); |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
625 |
try { |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
626 |
bundler.validate(localParams); |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
627 |
File result = bundler.execute(localParams, deployParams.outdir); |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
628 |
if (result == null) { |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
629 |
throw new PackagerException("MSG_BundlerFailed", |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
630 |
bundler.getID(), bundler.getName()); |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
631 |
} |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
632 |
Log.verbose(MessageFormat.format( |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
633 |
I18N.getString("message.bundle-created"), |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
634 |
bundler.getName())); |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
635 |
} catch (ConfigException e) { |
57776 | 636 |
Log.verbose(e); |
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
637 |
if (e.getAdvice() != null) { |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
638 |
throw new PackagerException(e, "MSG_BundlerConfigException", |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
639 |
bundler.getName(), e.getMessage(), e.getAdvice()); |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
640 |
} else { |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
641 |
throw new PackagerException(e, |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
642 |
"MSG_BundlerConfigExceptionNoAdvice", |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
643 |
bundler.getName(), e.getMessage()); |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
644 |
} |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
645 |
} catch (RuntimeException re) { |
57776 | 646 |
Log.verbose(re); |
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
647 |
throw new PackagerException(re, "MSG_BundlerRuntimeException", |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
648 |
bundler.getName(), re.toString()); |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
649 |
} finally { |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
650 |
if (userProvidedBuildRoot) { |
57261
13b6672477df
8220505: Allow building available installers when --installer-type not specified
herrick
parents:
57256
diff
changeset
|
651 |
Log.verbose(MessageFormat.format( |
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
652 |
I18N.getString("message.debug-working-directory"), |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57392
diff
changeset
|
653 |
(new File(buildRoot)).getAbsolutePath())); |
57421
0410ee319681
8226532: cleanup is not called when jpackage command fails.
herrick
parents:
57414
diff
changeset
|
654 |
} else { |
0410ee319681
8226532: cleanup is not called when jpackage command fails.
herrick
parents:
57414
diff
changeset
|
655 |
// always clean up the temporary directory created |
58115 | 656 |
// when --temp option not used. |
57421
0410ee319681
8226532: cleanup is not called when jpackage command fails.
herrick
parents:
57414
diff
changeset
|
657 |
bundler.cleanup(localParams); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
658 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
659 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
660 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
661 |
|
56994
b4aca2dbe2b5
8212537: Create method and class description comments for main functionality
herrick
parents:
56989
diff
changeset
|
662 |
private void addResources(DeployParams deployParams, |
57450
82c78b40b39d
8227058: Regressions related to no longer setting user.dir
herrick
parents:
57438
diff
changeset
|
663 |
String inputdir, String mainJar) throws PackagerException { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
664 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
665 |
if (inputdir == null || inputdir.isEmpty()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
666 |
return; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
667 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
668 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
669 |
File baseDir = new File(inputdir); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
670 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
671 |
if (!baseDir.isDirectory()) { |
57314 | 672 |
throw new PackagerException("ERR_InputNotDirectory", inputdir); |
673 |
} |
|
674 |
if (!baseDir.canRead()) { |
|
675 |
throw new PackagerException("ERR_CannotReadInputDir", inputdir); |
|
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
676 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
677 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
678 |
List<String> fileNames; |
57307 | 679 |
fileNames = new ArrayList<>(); |
680 |
try (Stream<Path> files = Files.list(baseDir.toPath())) { |
|
681 |
files.forEach(file -> fileNames.add( |
|
682 |
file.getFileName().toString())); |
|
683 |
} catch (IOException e) { |
|
684 |
Log.error("Unable to add resources: " + e.getMessage()); |
|
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
685 |
} |
56994
b4aca2dbe2b5
8212537: Create method and class description comments for main functionality
herrick
parents:
56989
diff
changeset
|
686 |
fileNames.forEach(file -> deployParams.addResource(baseDir, file)); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
687 |
|
57450
82c78b40b39d
8227058: Regressions related to no longer setting user.dir
herrick
parents:
57438
diff
changeset
|
688 |
deployParams.setClasspath(mainJar); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
689 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
690 |
|
57067
9c17d779808e
8213425: Analyze output from Source code scanner and fix where needed.
herrick
parents:
57065
diff
changeset
|
691 |
static CLIOptions toCLIOption(String arg) { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
692 |
CLIOptions option; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
693 |
if ((option = argIds.get(arg)) == null) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
694 |
option = argShortIds.get(arg); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
695 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
696 |
return option; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
697 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
698 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
699 |
static Map<String, String> getPropertiesFromFile(String filename) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
700 |
Map<String, String> map = new HashMap<>(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
701 |
// load properties file |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
702 |
File file = new File(filename); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
703 |
Properties properties = new Properties(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
704 |
try (FileInputStream in = new FileInputStream(file)) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
705 |
properties.load(in); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
706 |
} catch (IOException e) { |
57020
a828547f7e50
8213394: Stop using Log.info() except for expected output.
herrick
parents:
57017
diff
changeset
|
707 |
Log.error("Exception: " + e.getMessage()); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
708 |
} |
56957
2f01969ed7cb
8211299: Output of System.out is not printed to CMD on Windows
herrick
parents:
56933
diff
changeset
|
709 |
|
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
710 |
for (final String name: properties.stringPropertyNames()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
711 |
map.put(name, properties.getProperty(name)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
712 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
713 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
714 |
return map; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
715 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
716 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
717 |
static List<String> getArgumentList(String inputString) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
718 |
List<String> list = new ArrayList<>(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
719 |
if (inputString == null || inputString.isEmpty()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
720 |
return list; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
721 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
722 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
723 |
// The "pattern" regexp attempts to abide to the rule that |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
724 |
// strings are delimited by whitespace unless surrounded by |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
725 |
// quotes, then it is anything (including spaces) in the quotes. |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
726 |
Matcher m = pattern.matcher(inputString); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
727 |
while (m.find()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
728 |
String s = inputString.substring(m.start(), m.end()).trim(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
729 |
// Ensure we do not have an empty string. trim() will take care of |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
730 |
// whitespace only strings. The regex preserves quotes and escaped |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
731 |
// chars so we need to clean them before adding to the List |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
732 |
if (!s.isEmpty()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
733 |
list.add(unquoteIfNeeded(s)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
734 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
735 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
736 |
return list; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
737 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
738 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
739 |
private static String unquoteIfNeeded(String in) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
740 |
if (in == null) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
741 |
return null; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
742 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
743 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
744 |
if (in.isEmpty()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
745 |
return ""; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
746 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
747 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
748 |
// Use code points to preserve non-ASCII chars |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
749 |
StringBuilder sb = new StringBuilder(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
750 |
int codeLen = in.codePointCount(0, in.length()); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
751 |
int quoteChar = -1; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
752 |
for (int i = 0; i < codeLen; i++) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
753 |
int code = in.codePointAt(i); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
754 |
if (code == '"' || code == '\'') { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
755 |
// If quote is escaped make sure to copy it |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
756 |
if (i > 0 && in.codePointAt(i - 1) == '\\') { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
757 |
sb.deleteCharAt(sb.length() - 1); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
758 |
sb.appendCodePoint(code); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
759 |
continue; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
760 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
761 |
if (quoteChar != -1) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
762 |
if (code == quoteChar) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
763 |
// close quote, skip char |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
764 |
quoteChar = -1; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
765 |
} else { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
766 |
sb.appendCodePoint(code); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
767 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
768 |
} else { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
769 |
// opening quote, skip char |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
770 |
quoteChar = code; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
771 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
772 |
} else { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
773 |
sb.appendCodePoint(code); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
774 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
775 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
776 |
return sb.toString(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
777 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
778 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
779 |
private String getMainClassFromManifest() { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
780 |
if (mainJarPath == null || |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
781 |
input == null ) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
782 |
return null; |
56957
2f01969ed7cb
8211299: Output of System.out is not printed to CMD on Windows
herrick
parents:
56933
diff
changeset
|
783 |
} |
2f01969ed7cb
8211299: Output of System.out is not printed to CMD on Windows
herrick
parents:
56933
diff
changeset
|
784 |
|
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
785 |
JarFile jf; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
786 |
try { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
787 |
File file = new File(input, mainJarPath); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
788 |
if (!file.exists()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
789 |
return null; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
790 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
791 |
jf = new JarFile(file); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
792 |
Manifest m = jf.getManifest(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
793 |
Attributes attrs = (m != null) ? m.getMainAttributes() : null; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
794 |
if (attrs != null) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
795 |
return attrs.getValue(Attributes.Name.MAIN_CLASS); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
796 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
797 |
} catch (IOException ignore) {} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
798 |
return null; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
799 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
800 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
801 |
} |