author | herrick |
Wed, 23 Oct 2019 13:53:41 -0400 | |
branch | JDK-8200758-branch |
changeset 58763 | bc43733cd5cf |
parent 58762 | 0fe62353385b |
child 58922 | fbaf2e6402ad |
permissions | -rw-r--r-- |
57038 | 1 |
/* |
57106
ea870b9ce89a
8216492: Update copyright of all new jpackage fils to 2019
kcr
parents:
57103
diff
changeset
|
2 |
* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. |
57038 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. Oracle designates this |
|
8 |
* particular file as subject to the "Classpath" exception as provided |
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
|
10 |
* |
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
24 |
*/ |
|
25 |
||
57039 | 26 |
package jdk.jpackage.internal; |
57038 | 27 |
|
28 |
import java.io.*; |
|
29 |
import java.nio.charset.Charset; |
|
30 |
import java.nio.file.Files; |
|
58647
2c43b89b1679
8231862: Decouple DesktopIntegration and LinuxPackageBundler classes
herrick
parents:
58607
diff
changeset
|
31 |
import java.nio.file.Path; |
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
32 |
import java.nio.file.Paths; |
57038 | 33 |
import java.text.MessageFormat; |
34 |
import java.util.*; |
|
35 |
import java.util.regex.Pattern; |
|
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
36 |
import java.util.stream.Collectors; |
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
37 |
import javax.xml.stream.XMLOutputFactory; |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
38 |
import javax.xml.stream.XMLStreamException; |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
39 |
import javax.xml.stream.XMLStreamWriter; |
58647
2c43b89b1679
8231862: Decouple DesktopIntegration and LinuxPackageBundler classes
herrick
parents:
58607
diff
changeset
|
40 |
import static jdk.jpackage.internal.OverridableResource.createResource; |
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
41 |
import static jdk.jpackage.internal.StandardBundlerParam.*; |
57038 | 42 |
|
57039 | 43 |
import static jdk.jpackage.internal.WindowsBundlerParam.*; |
57038 | 44 |
|
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
45 |
/** |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
46 |
* WinMsiBundler |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
47 |
* |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
48 |
* Produces .msi installer from application image. Uses WiX Toolkit to build |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
49 |
* .msi installer. |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
50 |
* <p> |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
51 |
* {@link #execute} method creates a number of source files with the description |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
52 |
* of installer to be processed by WiX tools. Generated source files are stored |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
53 |
* in "config" subdirectory next to "app" subdirectory in the root work |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
54 |
* directory. The following WiX source files are generated: |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
55 |
* <ul> |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
56 |
* <li>main.wxs. Main source file with the installer description |
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
57 |
* <li>bundle.wxf. Source file with application and Java run-time directory tree |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
58 |
* description. |
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
59 |
* </ul> |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
60 |
* <p> |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
61 |
* main.wxs file is a copy of main.wxs resource from |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
62 |
* jdk.jpackage.internal.resources package. It is parametrized with the |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
63 |
* following WiX variables: |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
64 |
* <ul> |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
65 |
* <li>JpAppName. Name of the application. Set to the value of --name command |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
66 |
* line option |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
67 |
* <li>JpAppVersion. Version of the application. Set to the value of |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
68 |
* --app-version command line option |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
69 |
* <li>JpAppVendor. Vendor of the application. Set to the value of --vendor |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
70 |
* command line option |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
71 |
* <li>JpAppDescription. Description of the application. Set to the value of |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
72 |
* --description command line option |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
73 |
* <li>JpProductCode. Set to product code UUID of the application. Random value |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
74 |
* generated by jpackage every time {@link #execute} method is called |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
75 |
* <li>JpProductUpgradeCode. Set to upgrade code UUID of the application. Random |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
76 |
* value generated by jpackage every time {@link #execute} method is called if |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
77 |
* --win-upgrade-uuid command line option is not specified. Otherwise this |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
78 |
* variable is set to the value of --win-upgrade-uuid command line option |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
79 |
* <li>JpAllowDowngrades. Set to "yes" if --win-upgrade-uuid command line option |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
80 |
* was specified. Undefined otherwise |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
81 |
* <li>JpLicenseRtf. Set to the value of --license-file command line option. |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
82 |
* Undefined is --license-file command line option was not specified |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
83 |
* <li>JpInstallDirChooser. Set to "yes" if --win-dir-chooser command line |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
84 |
* option was specified. Undefined otherwise |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
85 |
* <li>JpConfigDir. Absolute path to the directory with generated WiX source |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
86 |
* files. |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
87 |
* <li>JpIsSystemWide. Set to "yes" if --win-per-user-install command line |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
88 |
* option was not specified. Undefined otherwise |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
89 |
* </ul> |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
90 |
*/ |
57038 | 91 |
public class WinMsiBundler extends AbstractBundler { |
92 |
||
93 |
public static final BundlerParamInfo<WinAppBundler> APP_BUNDLER = |
|
94 |
new WindowsBundlerParam<>( |
|
95 |
"win.app.bundler", |
|
96 |
WinAppBundler.class, |
|
97 |
params -> new WinAppBundler(), |
|
98 |
null); |
|
99 |
||
100 |
public static final BundlerParamInfo<File> MSI_IMAGE_DIR = |
|
101 |
new WindowsBundlerParam<>( |
|
102 |
"win.msi.imageDir", |
|
103 |
File.class, |
|
104 |
params -> { |
|
105 |
File imagesRoot = IMAGES_ROOT.fetchFrom(params); |
|
106 |
if (!imagesRoot.exists()) imagesRoot.mkdirs(); |
|
107 |
return new File(imagesRoot, "win-msi.image"); |
|
108 |
}, |
|
109 |
(s, p) -> null); |
|
110 |
||
111 |
public static final BundlerParamInfo<File> WIN_APP_IMAGE = |
|
112 |
new WindowsBundlerParam<>( |
|
113 |
"win.app.image", |
|
114 |
File.class, |
|
115 |
null, |
|
116 |
(s, p) -> null); |
|
117 |
||
118 |
public static final StandardBundlerParam<Boolean> MSI_SYSTEM_WIDE = |
|
119 |
new StandardBundlerParam<>( |
|
120 |
Arguments.CLIOptions.WIN_PER_USER_INSTALLATION.getId(), |
|
121 |
Boolean.class, |
|
122 |
params -> true, // MSIs default to system wide |
|
123 |
// valueOf(null) is false, |
|
124 |
// and we actually do want null |
|
125 |
(s, p) -> (s == null || "null".equalsIgnoreCase(s))? null |
|
126 |
: Boolean.valueOf(s) |
|
127 |
); |
|
128 |
||
129 |
||
130 |
public static final StandardBundlerParam<String> PRODUCT_VERSION = |
|
131 |
new StandardBundlerParam<>( |
|
132 |
"win.msi.productVersion", |
|
133 |
String.class, |
|
134 |
VERSION::fetchFrom, |
|
135 |
(s, p) -> s |
|
136 |
); |
|
137 |
||
138 |
public static final BundlerParamInfo<UUID> UPGRADE_UUID = |
|
139 |
new WindowsBundlerParam<>( |
|
57062
044e7a644ee3
8214575: Exe installers will install application to already existing instalation
herrick
parents:
57059
diff
changeset
|
140 |
Arguments.CLIOptions.WIN_UPGRADE_UUID.getId(), |
57038 | 141 |
UUID.class, |
57062
044e7a644ee3
8214575: Exe installers will install application to already existing instalation
herrick
parents:
57059
diff
changeset
|
142 |
params -> UUID.randomUUID(), |
57038 | 143 |
(s, p) -> UUID.fromString(s)); |
144 |
||
145 |
@Override |
|
146 |
public String getName() { |
|
57059 | 147 |
return I18N.getString("msi.bundler.name"); |
57038 | 148 |
} |
149 |
||
150 |
@Override |
|
151 |
public String getID() { |
|
152 |
return "msi"; |
|
153 |
} |
|
154 |
||
155 |
@Override |
|
156 |
public String getBundleType() { |
|
157 |
return "INSTALLER"; |
|
158 |
} |
|
159 |
||
160 |
@Override |
|
57140 | 161 |
public File execute(Map<String, ? super Object> params, |
162 |
File outputParentDir) throws PackagerException { |
|
57038 | 163 |
return bundle(params, outputParentDir); |
164 |
} |
|
165 |
||
166 |
@Override |
|
57150 | 167 |
public boolean supported(boolean platformInstaller) { |
57438
4a31db8d42bd
8226599: use code coverage results to remove dead code
herrick
parents:
57414
diff
changeset
|
168 |
try { |
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
169 |
if (wixToolset == null) { |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
170 |
wixToolset = WixTool.toolset(); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
171 |
} |
57951
37e70d4679df
8230152: No appropriate error message when wix tools missing.
herrick
parents:
57909
diff
changeset
|
172 |
return true; |
37e70d4679df
8230152: No appropriate error message when wix tools missing.
herrick
parents:
57909
diff
changeset
|
173 |
} catch (ConfigException ce) { |
37e70d4679df
8230152: No appropriate error message when wix tools missing.
herrick
parents:
57909
diff
changeset
|
174 |
Log.error(ce.getMessage()); |
37e70d4679df
8230152: No appropriate error message when wix tools missing.
herrick
parents:
57909
diff
changeset
|
175 |
if (ce.getAdvice() != null) { |
37e70d4679df
8230152: No appropriate error message when wix tools missing.
herrick
parents:
57909
diff
changeset
|
176 |
Log.error(ce.getAdvice()); |
37e70d4679df
8230152: No appropriate error message when wix tools missing.
herrick
parents:
57909
diff
changeset
|
177 |
} |
57438
4a31db8d42bd
8226599: use code coverage results to remove dead code
herrick
parents:
57414
diff
changeset
|
178 |
} catch (Exception e) { |
57951
37e70d4679df
8230152: No appropriate error message when wix tools missing.
herrick
parents:
57909
diff
changeset
|
179 |
Log.error(e.getMessage()); |
57438
4a31db8d42bd
8226599: use code coverage results to remove dead code
herrick
parents:
57414
diff
changeset
|
180 |
} |
57951
37e70d4679df
8230152: No appropriate error message when wix tools missing.
herrick
parents:
57909
diff
changeset
|
181 |
return false; |
57038 | 182 |
} |
183 |
||
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
184 |
@Override |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
185 |
public boolean isDefault() { |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
186 |
return false; |
57438
4a31db8d42bd
8226599: use code coverage results to remove dead code
herrick
parents:
57414
diff
changeset
|
187 |
} |
4a31db8d42bd
8226599: use code coverage results to remove dead code
herrick
parents:
57414
diff
changeset
|
188 |
|
57038 | 189 |
@Override |
57396
3944e4c2f779
8223586: remove jpackage dead code and other cleanup
herrick
parents:
57391
diff
changeset
|
190 |
public boolean validate(Map<String, ? super Object> params) |
57438
4a31db8d42bd
8226599: use code coverage results to remove dead code
herrick
parents:
57414
diff
changeset
|
191 |
throws ConfigException { |
57038 | 192 |
try { |
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
193 |
if (wixToolset == null) { |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
194 |
wixToolset = WixTool.toolset(); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
195 |
} |
57038 | 196 |
|
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
197 |
for (var toolInfo: wixToolset.values()) { |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
198 |
Log.verbose(MessageFormat.format(I18N.getString( |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
199 |
"message.tool-version"), toolInfo.path.getFileName(), |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
200 |
toolInfo.version)); |
57038 | 201 |
} |
202 |
||
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
203 |
wixSourcesBuilder.setWixVersion(wixToolset.get(WixTool.Light).version); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
204 |
|
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
205 |
wixSourcesBuilder.logWixFeatures(); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
206 |
|
57038 | 207 |
/********* validate bundle parameters *************/ |
208 |
||
57396
3944e4c2f779
8223586: remove jpackage dead code and other cleanup
herrick
parents:
57391
diff
changeset
|
209 |
String version = PRODUCT_VERSION.fetchFrom(params); |
57038 | 210 |
if (!isVersionStringValid(version)) { |
211 |
throw new ConfigException( |
|
212 |
MessageFormat.format(I18N.getString( |
|
213 |
"error.version-string-wrong-format"), version), |
|
214 |
MessageFormat.format(I18N.getString( |
|
215 |
"error.version-string-wrong-format.advice"), |
|
216 |
PRODUCT_VERSION.getID())); |
|
217 |
} |
|
218 |
||
219 |
// only one mime type per association, at least one file extension |
|
220 |
List<Map<String, ? super Object>> associations = |
|
57396
3944e4c2f779
8223586: remove jpackage dead code and other cleanup
herrick
parents:
57391
diff
changeset
|
221 |
FILE_ASSOCIATIONS.fetchFrom(params); |
57038 | 222 |
if (associations != null) { |
223 |
for (int i = 0; i < associations.size(); i++) { |
|
224 |
Map<String, ? super Object> assoc = associations.get(i); |
|
225 |
List<String> mimes = FA_CONTENT_TYPE.fetchFrom(assoc); |
|
226 |
if (mimes.size() > 1) { |
|
227 |
throw new ConfigException(MessageFormat.format( |
|
228 |
I18N.getString("error.too-many-content-" |
|
229 |
+ "types-for-file-association"), i), |
|
230 |
I18N.getString("error.too-many-content-" |
|
231 |
+ "types-for-file-association.advice")); |
|
232 |
} |
|
233 |
} |
|
234 |
} |
|
235 |
||
236 |
return true; |
|
237 |
} catch (RuntimeException re) { |
|
238 |
if (re.getCause() instanceof ConfigException) { |
|
239 |
throw (ConfigException) re.getCause(); |
|
240 |
} else { |
|
241 |
throw new ConfigException(re); |
|
242 |
} |
|
243 |
} |
|
244 |
} |
|
245 |
||
58607
7451b17b40d3
8231912: Use https for URLs in help and error messages
herrick
parents:
58538
diff
changeset
|
246 |
// https://msdn.microsoft.com/en-us/library/aa370859%28v=VS.85%29.aspx |
57038 | 247 |
// The format of the string is as follows: |
248 |
// major.minor.build |
|
249 |
// The first field is the major version and has a maximum value of 255. |
|
250 |
// The second field is the minor version and has a maximum value of 255. |
|
251 |
// The third field is called the build version or the update version and |
|
252 |
// has a maximum value of 65,535. |
|
253 |
static boolean isVersionStringValid(String v) { |
|
254 |
if (v == null) { |
|
255 |
return true; |
|
256 |
} |
|
257 |
||
258 |
String p[] = v.split("\\."); |
|
259 |
if (p.length > 3) { |
|
260 |
Log.verbose(I18N.getString( |
|
261 |
"message.version-string-too-many-components")); |
|
262 |
return false; |
|
263 |
} |
|
264 |
||
265 |
try { |
|
266 |
int val = Integer.parseInt(p[0]); |
|
267 |
if (val < 0 || val > 255) { |
|
268 |
Log.verbose(I18N.getString( |
|
269 |
"error.version-string-major-out-of-range")); |
|
270 |
return false; |
|
271 |
} |
|
272 |
if (p.length > 1) { |
|
273 |
val = Integer.parseInt(p[1]); |
|
274 |
if (val < 0 || val > 255) { |
|
275 |
Log.verbose(I18N.getString( |
|
276 |
"error.version-string-minor-out-of-range")); |
|
277 |
return false; |
|
278 |
} |
|
279 |
} |
|
280 |
if (p.length > 2) { |
|
281 |
val = Integer.parseInt(p[2]); |
|
282 |
if (val < 0 || val > 65535) { |
|
283 |
Log.verbose(I18N.getString( |
|
284 |
"error.version-string-build-out-of-range")); |
|
285 |
return false; |
|
286 |
} |
|
287 |
} |
|
288 |
} catch (NumberFormatException ne) { |
|
289 |
Log.verbose(I18N.getString("error.version-string-part-not-number")); |
|
290 |
Log.verbose(ne); |
|
291 |
return false; |
|
292 |
} |
|
293 |
||
294 |
return true; |
|
295 |
} |
|
296 |
||
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
297 |
private void prepareProto(Map<String, ? super Object> params) |
57140 | 298 |
throws PackagerException, IOException { |
57396
3944e4c2f779
8223586: remove jpackage dead code and other cleanup
herrick
parents:
57391
diff
changeset
|
299 |
File appImage = StandardBundlerParam.getPredefinedAppImage(params); |
57038 | 300 |
File appDir = null; |
301 |
||
302 |
// we either have an application image or need to build one |
|
303 |
if (appImage != null) { |
|
57396
3944e4c2f779
8223586: remove jpackage dead code and other cleanup
herrick
parents:
57391
diff
changeset
|
304 |
appDir = new File(MSI_IMAGE_DIR.fetchFrom(params), |
3944e4c2f779
8223586: remove jpackage dead code and other cleanup
herrick
parents:
57391
diff
changeset
|
305 |
APP_NAME.fetchFrom(params)); |
57038 | 306 |
// copy everything from appImage dir into appDir/name |
307 |
IOUtils.copyRecursive(appImage.toPath(), appDir.toPath()); |
|
308 |
} else { |
|
57396
3944e4c2f779
8223586: remove jpackage dead code and other cleanup
herrick
parents:
57391
diff
changeset
|
309 |
appDir = APP_BUNDLER.fetchFrom(params).doBundle(params, |
3944e4c2f779
8223586: remove jpackage dead code and other cleanup
herrick
parents:
57391
diff
changeset
|
310 |
MSI_IMAGE_DIR.fetchFrom(params), true); |
57038 | 311 |
} |
312 |
||
57396
3944e4c2f779
8223586: remove jpackage dead code and other cleanup
herrick
parents:
57391
diff
changeset
|
313 |
params.put(WIN_APP_IMAGE.getID(), appDir); |
57038 | 314 |
|
57396
3944e4c2f779
8223586: remove jpackage dead code and other cleanup
herrick
parents:
57391
diff
changeset
|
315 |
String licenseFile = LICENSE_FILE.fetchFrom(params); |
57080 | 316 |
if (licenseFile != null) { |
57909
c7de06ed4b54
8229979: jpackage cleanup src files, help text, and javadoc
herrick
parents:
57806
diff
changeset
|
317 |
// need to copy license file to the working directory |
c7de06ed4b54
8229979: jpackage cleanup src files, help text, and javadoc
herrick
parents:
57806
diff
changeset
|
318 |
// and convert to rtf if needed |
57080 | 319 |
File lfile = new File(licenseFile); |
57396
3944e4c2f779
8223586: remove jpackage dead code and other cleanup
herrick
parents:
57391
diff
changeset
|
320 |
File destFile = new File(CONFIG_ROOT.fetchFrom(params), |
3944e4c2f779
8223586: remove jpackage dead code and other cleanup
herrick
parents:
57391
diff
changeset
|
321 |
lfile.getName()); |
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57407
diff
changeset
|
322 |
|
57080 | 323 |
IOUtils.copyFile(lfile, destFile); |
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
324 |
destFile.setWritable(true); |
57080 | 325 |
ensureByMutationFileIsRTF(destFile); |
57038 | 326 |
} |
327 |
} |
|
328 |
||
57396
3944e4c2f779
8223586: remove jpackage dead code and other cleanup
herrick
parents:
57391
diff
changeset
|
329 |
public File bundle(Map<String, ? super Object> params, File outdir) |
57140 | 330 |
throws PackagerException { |
57407 | 331 |
|
332 |
IOUtils.writableOutputDir(outdir.toPath()); |
|
57038 | 333 |
|
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
334 |
Path imageDir = MSI_IMAGE_DIR.fetchFrom(params).toPath(); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
335 |
try { |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
336 |
Files.createDirectories(imageDir); |
57038 | 337 |
|
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
338 |
prepareProto(params); |
57038 | 339 |
|
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
340 |
wixSourcesBuilder |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
341 |
.initFromParams(WIN_APP_IMAGE.fetchFrom(params).toPath(), params) |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
342 |
.createMainFragment(CONFIG_ROOT.fetchFrom(params).toPath().resolve( |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
343 |
"bundle.wxf")); |
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
344 |
|
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
345 |
Map<String, String> wixVars = prepareMainProjectFile(params); |
57038 | 346 |
|
58762
0fe62353385b
8232281: jpackage is not always reporting an error when no main class specified
herrick
parents:
58696
diff
changeset
|
347 |
new ScriptRunner() |
0fe62353385b
8232281: jpackage is not always reporting an error when no main class specified
herrick
parents:
58696
diff
changeset
|
348 |
.setDirectory(imageDir) |
0fe62353385b
8232281: jpackage is not always reporting an error when no main class specified
herrick
parents:
58696
diff
changeset
|
349 |
.setResourceCategoryId("resource.post-app-image-script") |
0fe62353385b
8232281: jpackage is not always reporting an error when no main class specified
herrick
parents:
58696
diff
changeset
|
350 |
.setScriptNameSuffix("post-image") |
0fe62353385b
8232281: jpackage is not always reporting an error when no main class specified
herrick
parents:
58696
diff
changeset
|
351 |
.setEnvironmentVariable("JpAppImageDir", imageDir.toAbsolutePath().toString()) |
0fe62353385b
8232281: jpackage is not always reporting an error when no main class specified
herrick
parents:
58696
diff
changeset
|
352 |
.run(params); |
0fe62353385b
8232281: jpackage is not always reporting an error when no main class specified
herrick
parents:
58696
diff
changeset
|
353 |
|
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
354 |
return buildMSI(params, wixVars, outdir); |
57038 | 355 |
} catch (IOException ex) { |
356 |
Log.verbose(ex); |
|
57140 | 357 |
throw new PackagerException(ex); |
57038 | 358 |
} |
359 |
} |
|
360 |
||
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
361 |
Map<String, String> prepareMainProjectFile( |
57038 | 362 |
Map<String, ? super Object> params) throws IOException { |
363 |
Map<String, String> data = new HashMap<>(); |
|
364 |
||
365 |
UUID productGUID = UUID.randomUUID(); |
|
366 |
||
367 |
Log.verbose(MessageFormat.format( |
|
368 |
I18N.getString("message.generated-product-guid"), |
|
369 |
productGUID.toString())); |
|
370 |
||
371 |
// we use random GUID for product itself but |
|
372 |
// user provided for upgrade guid |
|
373 |
// Upgrade guid is important to decide whether it is an upgrade of |
|
374 |
// installed app. I.e. we need it to be the same for |
|
375 |
// 2 different versions of app if possible |
|
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
376 |
data.put("JpProductCode", productGUID.toString()); |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
377 |
data.put("JpProductUpgradeCode", |
57038 | 378 |
UPGRADE_UUID.fetchFrom(params).toString()); |
379 |
||
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
380 |
if (!UPGRADE_UUID.getIsDefaultValue()) { |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
381 |
data.put("JpAllowDowngrades", "yes"); |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
382 |
} |
57038 | 383 |
|
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
384 |
data.put("JpAppName", APP_NAME.fetchFrom(params)); |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
385 |
data.put("JpAppDescription", DESCRIPTION.fetchFrom(params)); |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
386 |
data.put("JpAppVendor", VENDOR.fetchFrom(params)); |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
387 |
data.put("JpAppVersion", PRODUCT_VERSION.fetchFrom(params)); |
57038 | 388 |
|
57909
c7de06ed4b54
8229979: jpackage cleanup src files, help text, and javadoc
herrick
parents:
57806
diff
changeset
|
389 |
data.put("JpConfigDir", |
c7de06ed4b54
8229979: jpackage cleanup src files, help text, and javadoc
herrick
parents:
57806
diff
changeset
|
390 |
CONFIG_ROOT.fetchFrom(params).getAbsolutePath()); |
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
391 |
|
57038 | 392 |
if (MSI_SYSTEM_WIDE.fetchFrom(params)) { |
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
393 |
data.put("JpIsSystemWide", "yes"); |
57038 | 394 |
} |
395 |
||
57414
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57407
diff
changeset
|
396 |
String licenseFile = LICENSE_FILE.fetchFrom(params); |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57407
diff
changeset
|
397 |
if (licenseFile != null) { |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57407
diff
changeset
|
398 |
String lname = new File(licenseFile).getName(); |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57407
diff
changeset
|
399 |
File destFile = new File(CONFIG_ROOT.fetchFrom(params), lname); |
6eda749d3117
8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents:
57407
diff
changeset
|
400 |
data.put("JpLicenseRtf", destFile.getAbsolutePath()); |
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
401 |
} |
57038 | 402 |
|
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
403 |
// Copy CA dll to include with installer |
57254
c1b92a014e89
8214566: --win-dir-chooser does not prompt if destination folder is not empty
herrick
parents:
57219
diff
changeset
|
404 |
if (INSTALLDIR_CHOOSER.fetchFrom(params)) { |
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
405 |
data.put("JpInstallDirChooser", "yes"); |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
406 |
String fname = "wixhelper.dll"; |
58647
2c43b89b1679
8231862: Decouple DesktopIntegration and LinuxPackageBundler classes
herrick
parents:
58607
diff
changeset
|
407 |
try (InputStream is = OverridableResource.readDefault(fname)) { |
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
408 |
Files.copy(is, Paths.get( |
57909
c7de06ed4b54
8229979: jpackage cleanup src files, help text, and javadoc
herrick
parents:
57806
diff
changeset
|
409 |
CONFIG_ROOT.fetchFrom(params).getAbsolutePath(), |
c7de06ed4b54
8229979: jpackage cleanup src files, help text, and javadoc
herrick
parents:
57806
diff
changeset
|
410 |
fname)); |
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
411 |
} |
57254
c1b92a014e89
8214566: --win-dir-chooser does not prompt if destination folder is not empty
herrick
parents:
57219
diff
changeset
|
412 |
} |
c1b92a014e89
8214566: --win-dir-chooser does not prompt if destination folder is not empty
herrick
parents:
57219
diff
changeset
|
413 |
|
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
414 |
// Copy l10n files. |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
415 |
for (String loc : Arrays.asList("en", "ja", "zh_CN")) { |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
416 |
String fname = "MsiInstallerStrings_" + loc + ".wxl"; |
58647
2c43b89b1679
8231862: Decouple DesktopIntegration and LinuxPackageBundler classes
herrick
parents:
58607
diff
changeset
|
417 |
try (InputStream is = OverridableResource.readDefault(fname)) { |
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
418 |
Files.copy(is, Paths.get( |
57909
c7de06ed4b54
8229979: jpackage cleanup src files, help text, and javadoc
herrick
parents:
57806
diff
changeset
|
419 |
CONFIG_ROOT.fetchFrom(params).getAbsolutePath(), |
c7de06ed4b54
8229979: jpackage cleanup src files, help text, and javadoc
herrick
parents:
57806
diff
changeset
|
420 |
fname)); |
57038 | 421 |
} |
422 |
} |
|
423 |
||
58763
bc43733cd5cf
8232723: make the resource file main.wxs over-ridable
herrick
parents:
58762
diff
changeset
|
424 |
createResource("main.wxs", params) |
bc43733cd5cf
8232723: make the resource file main.wxs over-ridable
herrick
parents:
58762
diff
changeset
|
425 |
.setCategory(I18N.getString("resource.wxs-file")) |
bc43733cd5cf
8232723: make the resource file main.wxs over-ridable
herrick
parents:
58762
diff
changeset
|
426 |
.saveToFile(Paths.get(getConfig_ProjectFile(params) |
bc43733cd5cf
8232723: make the resource file main.wxs over-ridable
herrick
parents:
58762
diff
changeset
|
427 |
.getAbsolutePath())); |
bc43733cd5cf
8232723: make the resource file main.wxs over-ridable
herrick
parents:
58762
diff
changeset
|
428 |
|
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
429 |
|
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
430 |
return data; |
57038 | 431 |
} |
432 |
||
433 |
private File getConfig_ProjectFile(Map<String, ? super Object> params) { |
|
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
434 |
return new File(CONFIG_ROOT.fetchFrom(params), "main.wxs"); |
57038 | 435 |
} |
436 |
||
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
437 |
private File buildMSI(Map<String, ? super Object> params, |
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
438 |
Map<String, String> wixVars, File outdir) |
57038 | 439 |
throws IOException { |
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
440 |
|
57038 | 441 |
File msiOut = new File( |
442 |
outdir, INSTALLER_FILE_NAME.fetchFrom(params) + ".msi"); |
|
443 |
||
444 |
Log.verbose(MessageFormat.format(I18N.getString( |
|
445 |
"message.preparing-msi-config"), msiOut.getAbsolutePath())); |
|
446 |
||
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
447 |
WixPipeline wixPipeline = new WixPipeline() |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
448 |
.setToolset(wixToolset.entrySet().stream().collect( |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
449 |
Collectors.toMap( |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
450 |
entry -> entry.getKey(), |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
451 |
entry -> entry.getValue().path))) |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
452 |
.setWixObjDir(TEMP_ROOT.fetchFrom(params).toPath().resolve("wixobj")) |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
453 |
.setWorkDir(WIN_APP_IMAGE.fetchFrom(params).toPath()) |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
454 |
.addSource(CONFIG_ROOT.fetchFrom(params).toPath().resolve("main.wxs"), wixVars) |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
455 |
.addSource(CONFIG_ROOT.fetchFrom(params).toPath().resolve("bundle.wxf"), null); |
57038 | 456 |
|
457 |
Log.verbose(MessageFormat.format(I18N.getString( |
|
458 |
"message.generating-msi"), msiOut.getAbsolutePath())); |
|
459 |
||
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
460 |
boolean enableLicenseUI = (LICENSE_FILE.fetchFrom(params) != null); |
57038 | 461 |
boolean enableInstalldirUI = INSTALLDIR_CHOOSER.fetchFrom(params); |
462 |
||
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
463 |
List<String> lightArgs = new ArrayList<>(); |
57038 | 464 |
|
57473
3ef9726d7eec
8220807: excessive verbose output when running with --win-per-user-install
herrick
parents:
57438
diff
changeset
|
465 |
if (!MSI_SYSTEM_WIDE.fetchFrom(params)) { |
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
466 |
wixPipeline.addLightOptions("-sice:ICE91"); |
57473
3ef9726d7eec
8220807: excessive verbose output when running with --win-per-user-install
herrick
parents:
57438
diff
changeset
|
467 |
} |
57038 | 468 |
if (enableLicenseUI || enableInstalldirUI) { |
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
469 |
wixPipeline.addLightOptions("-ext", "WixUIExtension"); |
57038 | 470 |
} |
57254
c1b92a014e89
8214566: --win-dir-chooser does not prompt if destination folder is not empty
herrick
parents:
57219
diff
changeset
|
471 |
|
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
472 |
wixPipeline.addLightOptions("-loc", |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
473 |
CONFIG_ROOT.fetchFrom(params).toPath().resolve(I18N.getString( |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
474 |
"resource.wxl-file-name")).toAbsolutePath().toString()); |
57404
a477b26bf888
8223643: Provide better defined context for custom installer steps on Windows
herrick
parents:
57397
diff
changeset
|
475 |
|
57254
c1b92a014e89
8214566: --win-dir-chooser does not prompt if destination folder is not empty
herrick
parents:
57219
diff
changeset
|
476 |
// Only needed if we using CA dll, so Wix can find it |
c1b92a014e89
8214566: --win-dir-chooser does not prompt if destination folder is not empty
herrick
parents:
57219
diff
changeset
|
477 |
if (enableInstalldirUI) { |
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
478 |
wixPipeline.addLightOptions("-b", CONFIG_ROOT.fetchFrom(params).getAbsolutePath()); |
57254
c1b92a014e89
8214566: --win-dir-chooser does not prompt if destination folder is not empty
herrick
parents:
57219
diff
changeset
|
479 |
} |
c1b92a014e89
8214566: --win-dir-chooser does not prompt if destination folder is not empty
herrick
parents:
57219
diff
changeset
|
480 |
|
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
481 |
wixPipeline.buildMsi(msiOut.toPath().toAbsolutePath()); |
57038 | 482 |
|
483 |
return msiOut; |
|
484 |
} |
|
485 |
||
486 |
public static void ensureByMutationFileIsRTF(File f) { |
|
487 |
if (f == null || !f.isFile()) return; |
|
488 |
||
489 |
try { |
|
490 |
boolean existingLicenseIsRTF = false; |
|
491 |
||
492 |
try (FileInputStream fin = new FileInputStream(f)) { |
|
493 |
byte[] firstBits = new byte[7]; |
|
494 |
||
495 |
if (fin.read(firstBits) == firstBits.length) { |
|
496 |
String header = new String(firstBits); |
|
497 |
existingLicenseIsRTF = "{\\rtf1\\".equals(header); |
|
498 |
} |
|
499 |
} |
|
500 |
||
501 |
if (!existingLicenseIsRTF) { |
|
502 |
List<String> oldLicense = Files.readAllLines(f.toPath()); |
|
503 |
try (Writer w = Files.newBufferedWriter( |
|
504 |
f.toPath(), Charset.forName("Windows-1252"))) { |
|
505 |
w.write("{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033" |
|
506 |
+ "{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\n" |
|
507 |
+ "\\viewkind4\\uc1\\pard\\sa200\\sl276" |
|
508 |
+ "\\slmult1\\lang9\\fs20 "); |
|
509 |
oldLicense.forEach(l -> { |
|
510 |
try { |
|
511 |
for (char c : l.toCharArray()) { |
|
512 |
// 0x00 <= ch < 0x20 Escaped (\'hh) |
|
513 |
// 0x20 <= ch < 0x80 Raw(non - escaped) char |
|
514 |
// 0x80 <= ch <= 0xFF Escaped(\ 'hh) |
|
515 |
// 0x5C, 0x7B, 0x7D (special RTF characters |
|
516 |
// \,{,})Escaped(\'hh) |
|
517 |
// ch > 0xff Escaped (\\ud###?) |
|
518 |
if (c < 0x10) { |
|
519 |
w.write("\\'0"); |
|
520 |
w.write(Integer.toHexString(c)); |
|
521 |
} else if (c > 0xff) { |
|
522 |
w.write("\\ud"); |
|
523 |
w.write(Integer.toString(c)); |
|
524 |
// \\uc1 is in the header and in effect |
|
525 |
// so we trail with a replacement char if |
|
526 |
// the font lacks that character - '?' |
|
527 |
w.write("?"); |
|
528 |
} else if ((c < 0x20) || (c >= 0x80) || |
|
529 |
(c == 0x5C) || (c == 0x7B) || |
|
530 |
(c == 0x7D)) { |
|
531 |
w.write("\\'"); |
|
532 |
w.write(Integer.toHexString(c)); |
|
533 |
} else { |
|
534 |
w.write(c); |
|
535 |
} |
|
536 |
} |
|
537 |
// blank lines are interpreted as paragraph breaks |
|
538 |
if (l.length() < 1) { |
|
539 |
w.write("\\par"); |
|
540 |
} else { |
|
541 |
w.write(" "); |
|
542 |
} |
|
543 |
w.write("\r\n"); |
|
544 |
} catch (IOException e) { |
|
545 |
Log.verbose(e); |
|
546 |
} |
|
547 |
}); |
|
548 |
w.write("}\r\n"); |
|
549 |
} |
|
550 |
} |
|
551 |
} catch (IOException e) { |
|
552 |
Log.verbose(e); |
|
553 |
} |
|
554 |
||
555 |
} |
|
58114
42df7de58e39
8230519: jpackage "--package-type" values and default
herrick
parents:
57951
diff
changeset
|
556 |
|
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
557 |
private Map<WixTool, WixTool.ToolInfo> wixToolset; |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
558 |
private WixSourcesBuilder wixSourcesBuilder = new WixSourcesBuilder(); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58647
diff
changeset
|
559 |
|
57038 | 560 |
} |