author | herrick |
Wed, 17 Oct 2018 13:50:11 -0400 | |
branch | JDK-8200758-branch |
changeset 56982 | e094d5483bd6 |
parent 56947 | 5a03c4524b90 |
child 56989 | 0f19096663d1 |
permissions | -rw-r--r-- |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1 |
/* |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
2 |
* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. |
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 |
*/ |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
25 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
26 |
package jdk.packager.internal.windows; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
27 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
28 |
import jdk.packager.internal.*; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
29 |
import jdk.packager.internal.ConfigException; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
30 |
import jdk.packager.internal.Arguments; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
31 |
import jdk.packager.internal.UnsupportedPlatformException; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
32 |
import jdk.packager.internal.resources.windows.WinResources; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
33 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
34 |
import java.io.*; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
35 |
import java.nio.charset.Charset; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
36 |
import java.nio.file.Files; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
37 |
import java.text.MessageFormat; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
38 |
import java.util.*; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
39 |
import java.util.regex.Matcher; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
40 |
import java.util.regex.Pattern; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
41 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
42 |
import static jdk.packager.internal.windows.WindowsBundlerParam.*; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
43 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
44 |
public class WinMsiBundler extends AbstractBundler { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
45 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
46 |
private static final ResourceBundle I18N = |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
47 |
ResourceBundle.getBundle( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
48 |
"jdk.packager.internal.resources.windows.WinMsiBundler"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
49 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
50 |
public static final BundlerParamInfo<WinAppBundler> APP_BUNDLER = |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
51 |
new WindowsBundlerParam<>( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
52 |
I18N.getString("param.app-bundler.name"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
53 |
I18N.getString("param.app-bundler.description"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
54 |
"win.app.bundler", |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
55 |
WinAppBundler.class, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
56 |
params -> new WinAppBundler(), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
57 |
null); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
58 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
59 |
public static final BundlerParamInfo<Boolean> CAN_USE_WIX36 = |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
60 |
new WindowsBundlerParam<>( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
61 |
I18N.getString("param.can-use-wix36.name"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
62 |
I18N.getString("param.can-use-wix36.description"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
63 |
"win.msi.canUseWix36", |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
64 |
Boolean.class, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
65 |
params -> false, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
66 |
(s, p) -> Boolean.valueOf(s)); |
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 |
public static final BundlerParamInfo<File> CONFIG_ROOT = |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
69 |
new WindowsBundlerParam<>( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
70 |
I18N.getString("param.config-root.name"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
71 |
I18N.getString("param.config-root.description"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
72 |
"configRoot", |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
73 |
File.class, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
74 |
params -> { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
75 |
File imagesRoot = |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
76 |
new File(BUILD_ROOT.fetchFrom(params), "windows"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
77 |
imagesRoot.mkdirs(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
78 |
return imagesRoot; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
79 |
}, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
80 |
(s, p) -> 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 |
public static final BundlerParamInfo<File> MSI_IMAGE_DIR = |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
83 |
new WindowsBundlerParam<>( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
84 |
I18N.getString("param.image-dir.name"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
85 |
I18N.getString("param.image-dir.description"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
86 |
"win.msi.imageDir", |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
87 |
File.class, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
88 |
params -> { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
89 |
File imagesRoot = IMAGES_ROOT.fetchFrom(params); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
90 |
if (!imagesRoot.exists()) imagesRoot.mkdirs(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
91 |
return new File(imagesRoot, "win-msi.image"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
92 |
}, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
93 |
(s, p) -> null); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
94 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
95 |
public static final BundlerParamInfo<File> WIN_APP_IMAGE = |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
96 |
new WindowsBundlerParam<>( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
97 |
I18N.getString("param.app-dir.name"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
98 |
I18N.getString("param.app-dir.description"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
99 |
"win.app.image", |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
100 |
File.class, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
101 |
null, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
102 |
(s, p) -> null); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
103 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
104 |
public static final StandardBundlerParam<Boolean> MSI_SYSTEM_WIDE = |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
105 |
new StandardBundlerParam<>( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
106 |
I18N.getString("param.system-wide.name"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
107 |
I18N.getString("param.system-wide.description"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
108 |
Arguments.CLIOptions.WIN_PER_USER_INSTALLATION.getId(), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
109 |
Boolean.class, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
110 |
params -> true, // MSIs default to system wide |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
111 |
// valueOf(null) is false, |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
112 |
// and we actually do want null |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
113 |
(s, p) -> (s == null || "null".equalsIgnoreCase(s))? null |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
114 |
: Boolean.valueOf(s) |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
115 |
); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
116 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
117 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
118 |
public static final StandardBundlerParam<String> PRODUCT_VERSION = |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
119 |
new StandardBundlerParam<>( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
120 |
I18N.getString("param.product-version.name"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
121 |
I18N.getString("param.product-version.description"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
122 |
"win.msi.productVersion", |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
123 |
String.class, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
124 |
VERSION::fetchFrom, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
125 |
(s, p) -> s |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
126 |
); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
127 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
128 |
public static final BundlerParamInfo<UUID> UPGRADE_UUID = |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
129 |
new WindowsBundlerParam<>( |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
130 |
I18N.getString("param.upgrade-uuid.name"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
131 |
I18N.getString("param.upgrade-uuid.description"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
132 |
Arguments.CLIOptions.WIN_MSI_UPGRADE_UUID.getId(), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
133 |
UUID.class, |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
134 |
params -> UUID.randomUUID(), // TODO check to see |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
135 |
// if identifier is a valid UUID during default |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
136 |
(s, p) -> UUID.fromString(s)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
137 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
138 |
private static final String TOOL_CANDLE = "candle.exe"; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
139 |
private static final String TOOL_LIGHT = "light.exe"; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
140 |
// autodetect just v3.7, v3.8, 3.9, 3.10 and 3.11 |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
141 |
private static final String AUTODETECT_DIRS = |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
142 |
";C:\\Program Files (x86)\\WiX Toolset v3.11\\bin;" |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
143 |
+ "C:\\Program Files\\WiX Toolset v3.11\\bin;" |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
144 |
+ "C:\\Program Files (x86)\\WiX Toolset v3.10\\bin;" |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
145 |
+ "C:\\Program Files\\WiX Toolset v3.10\\bin;" |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
146 |
+ "C:\\Program Files (x86)\\WiX Toolset v3.9\\bin;" |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
147 |
+ "C:\\Program Files\\WiX Toolset v3.9\\bin;" |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
148 |
+ "C:\\Program Files (x86)\\WiX Toolset v3.8\\bin;" |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
149 |
+ "C:\\Program Files\\WiX Toolset v3.8\\bin;" |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
150 |
+ "C:\\Program Files (x86)\\WiX Toolset v3.7\\bin;" |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
151 |
+ "C:\\Program Files\\WiX Toolset v3.7\\bin"; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
152 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
153 |
public static final BundlerParamInfo<String> TOOL_CANDLE_EXECUTABLE = |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
154 |
new WindowsBundlerParam<>( |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
155 |
I18N.getString("param.candle-path.name"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
156 |
I18N.getString("param.candle-path.description"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
157 |
"win.msi.candle.exe", |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
158 |
String.class, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
159 |
params -> { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
160 |
for (String dirString : (System.getenv("PATH") + |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
161 |
AUTODETECT_DIRS).split(";")) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
162 |
File f = new File(dirString.replace("\"", ""), TOOL_CANDLE); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
163 |
if (f.isFile()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
164 |
return f.toString(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
165 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
166 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
167 |
return null; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
168 |
}, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
169 |
null); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
170 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
171 |
public static final BundlerParamInfo<String> TOOL_LIGHT_EXECUTABLE = |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
172 |
new WindowsBundlerParam<>( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
173 |
I18N.getString("param.light-path.name"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
174 |
I18N.getString("param.light-path.description"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
175 |
"win.msi.light.exe", |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
176 |
String.class, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
177 |
params -> { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
178 |
for (String dirString : (System.getenv("PATH") + |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
179 |
AUTODETECT_DIRS).split(";")) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
180 |
File f = new File(dirString.replace("\"", ""), TOOL_LIGHT); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
181 |
if (f.isFile()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
182 |
return f.toString(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
183 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
184 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
185 |
return null; |
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 |
null); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
188 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
189 |
public static final StandardBundlerParam<Boolean> MENU_HINT = |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
190 |
new WindowsBundlerParam<>( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
191 |
I18N.getString("param.menu-shortcut-hint.name"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
192 |
I18N.getString("param.menu-shortcut-hint.description"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
193 |
Arguments.CLIOptions.WIN_MENU_HINT.getId(), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
194 |
Boolean.class, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
195 |
params -> false, |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
196 |
// valueOf(null) is false, |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
197 |
// and we actually do want null in some cases |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
198 |
(s, p) -> (s == null || |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
199 |
"null".equalsIgnoreCase(s))? true : Boolean.valueOf(s) |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
200 |
); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
201 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
202 |
public static final StandardBundlerParam<Boolean> SHORTCUT_HINT = |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
203 |
new WindowsBundlerParam<>( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
204 |
I18N.getString("param.desktop-shortcut-hint.name"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
205 |
I18N.getString("param.desktop-shortcut-hint.description"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
206 |
Arguments.CLIOptions.WIN_SHORTCUT_HINT.getId(), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
207 |
Boolean.class, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
208 |
params -> false, |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
209 |
// valueOf(null) is false, |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
210 |
// and we actually do want null in some cases |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
211 |
(s, p) -> (s == null || |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
212 |
"null".equalsIgnoreCase(s))? false : Boolean.valueOf(s) |
56821
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 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
215 |
public WinMsiBundler() { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
216 |
super(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
217 |
baseResourceLoader = WinResources.class; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
218 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
219 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
220 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
221 |
@Override |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
222 |
public String getName() { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
223 |
return I18N.getString("bundler.name"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
224 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
225 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
226 |
@Override |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
227 |
public String getDescription() { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
228 |
return I18N.getString("bundler.description"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
229 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
230 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
231 |
@Override |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
232 |
public String getID() { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
233 |
return "msi"; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
234 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
235 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
236 |
@Override |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
237 |
public String getBundleType() { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
238 |
return "INSTALLER"; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
239 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
240 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
241 |
@Override |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
242 |
public Collection<BundlerParamInfo<?>> getBundleParameters() { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
243 |
Collection<BundlerParamInfo<?>> results = new LinkedHashSet<>(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
244 |
results.addAll(WinAppBundler.getAppBundleParameters()); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
245 |
results.addAll(getMsiBundleParameters()); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
246 |
return results; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
247 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
248 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
249 |
public static Collection<BundlerParamInfo<?>> getMsiBundleParameters() { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
250 |
return Arrays.asList( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
251 |
DESCRIPTION, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
252 |
MENU_GROUP, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
253 |
MENU_HINT, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
254 |
PRODUCT_VERSION, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
255 |
SHORTCUT_HINT, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
256 |
MSI_SYSTEM_WIDE, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
257 |
VENDOR, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
258 |
LICENSE_FILE, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
259 |
INSTALLDIR_CHOOSER |
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 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
263 |
@Override |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
264 |
public File execute( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
265 |
Map<String, ? super Object> params, File outputParentDir) { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
266 |
return bundle(params, outputParentDir); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
267 |
} |
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 |
@Override |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
270 |
public boolean supported() { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
271 |
return (Platform.getPlatform() == Platform.WINDOWS); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
272 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
273 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
274 |
static class VersionExtractor extends PrintStream { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
275 |
double version = 0f; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
276 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
277 |
public VersionExtractor() { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
278 |
super(new ByteArrayOutputStream()); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
279 |
} |
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 |
double getVersion() { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
282 |
if (version == 0f) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
283 |
String content = |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
284 |
new String(((ByteArrayOutputStream) out).toByteArray()); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
285 |
Pattern pattern = Pattern.compile("version (\\d+.\\d+)"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
286 |
Matcher matcher = pattern.matcher(content); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
287 |
if (matcher.find()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
288 |
String v = matcher.group(1); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
289 |
version = new Double(v); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
290 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
291 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
292 |
return version; |
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 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
295 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
296 |
private static double findToolVersion(String toolName) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
297 |
try { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
298 |
if (toolName == null || "".equals(toolName)) return 0f; |
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 |
ProcessBuilder pb = new ProcessBuilder( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
301 |
toolName, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
302 |
"/?"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
303 |
VersionExtractor ve = new VersionExtractor(); |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
304 |
// not interested in the output |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
305 |
IOUtils.exec(pb, Log.isDebug(), true, ve); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
306 |
double version = ve.getVersion(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
307 |
Log.verbose(MessageFormat.format( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
308 |
I18N.getString("message.tool-version"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
309 |
toolName, version)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
310 |
return version; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
311 |
} catch (Exception e) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
312 |
if (Log.isDebug()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
313 |
Log.verbose(e); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
314 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
315 |
return 0f; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
316 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
317 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
318 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
319 |
@Override |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
320 |
public boolean validate(Map<String, ? super Object> p) |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
321 |
throws UnsupportedPlatformException, ConfigException { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
322 |
try { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
323 |
if (p == null) throw new ConfigException( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
324 |
I18N.getString("error.parameters-null"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
325 |
I18N.getString("error.parameters-null.advice")); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
326 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
327 |
// run basic validation to ensure requirements are met |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
328 |
// we are not interested in return code, only possible exception |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
329 |
APP_BUNDLER.fetchFrom(p).doValidate(p); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
330 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
331 |
double candleVersion = |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
332 |
findToolVersion(TOOL_CANDLE_EXECUTABLE.fetchFrom(p)); |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
333 |
double lightVersion = |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
334 |
findToolVersion(TOOL_LIGHT_EXECUTABLE.fetchFrom(p)); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
335 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
336 |
// WiX 3.0+ is required |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
337 |
double minVersion = 3.0f; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
338 |
boolean bad = false; |
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 |
if (candleVersion < minVersion) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
341 |
Log.verbose(MessageFormat.format( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
342 |
I18N.getString("message.wrong-tool-version"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
343 |
TOOL_CANDLE, candleVersion, minVersion)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
344 |
bad = true; |
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 |
if (lightVersion < minVersion) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
347 |
Log.verbose(MessageFormat.format( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
348 |
I18N.getString("message.wrong-tool-version"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
349 |
TOOL_LIGHT, lightVersion, minVersion)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
350 |
bad = true; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
351 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
352 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
353 |
if (bad){ |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
354 |
throw new ConfigException( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
355 |
I18N.getString("error.no-wix-tools"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
356 |
I18N.getString("error.no-wix-tools.advice")); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
357 |
} |
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 |
if (lightVersion >= 3.6f) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
360 |
Log.verbose(I18N.getString("message.use-wix36-features")); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
361 |
p.put(CAN_USE_WIX36.getID(), Boolean.TRUE); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
362 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
363 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
364 |
/********* validate bundle parameters *************/ |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
365 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
366 |
String version = PRODUCT_VERSION.fetchFrom(p); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
367 |
if (!isVersionStringValid(version)) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
368 |
throw new ConfigException( |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
369 |
MessageFormat.format(I18N.getString( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
370 |
"error.version-string-wrong-format"), version), |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
371 |
MessageFormat.format(I18N.getString( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
372 |
"error.version-string-wrong-format.advice"), |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
373 |
PRODUCT_VERSION.getID())); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
374 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
375 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
376 |
// only one mime type per association, at least one file extension |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
377 |
List<Map<String, ? super Object>> associations = |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
378 |
FILE_ASSOCIATIONS.fetchFrom(p); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
379 |
if (associations != null) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
380 |
for (int i = 0; i < associations.size(); i++) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
381 |
Map<String, ? super Object> assoc = associations.get(i); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
382 |
List<String> mimes = FA_CONTENT_TYPE.fetchFrom(assoc); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
383 |
if (mimes.size() > 1) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
384 |
throw new ConfigException(MessageFormat.format( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
385 |
I18N.getString("error.too-many-content-" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
386 |
+ "types-for-file-association"), i), |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
387 |
I18N.getString("error.too-many-content-" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
388 |
+ "types-for-file-association.advice")); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
389 |
} |
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 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
392 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
393 |
// validate license file, if used, exists in the proper place |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
394 |
if (p.containsKey(LICENSE_FILE.getID())) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
395 |
List<RelativeFileSet> appResourcesList = |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
396 |
APP_RESOURCES_LIST.fetchFrom(p); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
397 |
for (String license : LICENSE_FILE.fetchFrom(p)) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
398 |
boolean found = false; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
399 |
for (RelativeFileSet appResources : appResourcesList) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
400 |
found = found || appResources.contains(license); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
401 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
402 |
if (!found) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
403 |
throw new ConfigException( |
56851 | 404 |
MessageFormat.format(I18N.getString( |
405 |
"error.license-missing"), license), |
|
406 |
MessageFormat.format(I18N.getString( |
|
407 |
"error.license-missing.advice"), license)); |
|
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
408 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
409 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
410 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
411 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
412 |
return true; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
413 |
} catch (RuntimeException re) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
414 |
if (re.getCause() instanceof ConfigException) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
415 |
throw (ConfigException) re.getCause(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
416 |
} else { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
417 |
throw new ConfigException(re); |
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 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
420 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
421 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
422 |
// http://msdn.microsoft.com/en-us/library/aa370859%28v=VS.85%29.aspx |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
423 |
// The format of the string is as follows: |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
424 |
// major.minor.build |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
425 |
// The first field is the major version and has a maximum value of 255. |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
426 |
// The second field is the minor version and has a maximum value of 255. |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
427 |
// The third field is called the build version or the update version and |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
428 |
// has a maximum value of 65,535. |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
429 |
static boolean isVersionStringValid(String v) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
430 |
if (v == null) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
431 |
return true; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
432 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
433 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
434 |
String p[] = v.split("\\."); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
435 |
if (p.length > 3) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
436 |
Log.verbose(I18N.getString( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
437 |
"message.version-string-too-many-components")); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
438 |
return false; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
439 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
440 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
441 |
try { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
442 |
int val = Integer.parseInt(p[0]); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
443 |
if (val < 0 || val > 255) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
444 |
Log.verbose(I18N.getString( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
445 |
"error.version-string-major-out-of-range")); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
446 |
return false; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
447 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
448 |
if (p.length > 1) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
449 |
val = Integer.parseInt(p[1]); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
450 |
if (val < 0 || val > 255) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
451 |
Log.verbose(I18N.getString( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
452 |
"error.version-string-minor-out-of-range")); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
453 |
return false; |
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 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
456 |
if (p.length > 2) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
457 |
val = Integer.parseInt(p[2]); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
458 |
if (val < 0 || val > 65535) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
459 |
Log.verbose(I18N.getString( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
460 |
"error.version-string-build-out-of-range")); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
461 |
return false; |
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 |
} catch (NumberFormatException ne) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
465 |
Log.verbose(I18N.getString("error.version-string-part-not-number")); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
466 |
Log.verbose(ne); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
467 |
return false; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
468 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
469 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
470 |
return true; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
471 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
472 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
473 |
private boolean prepareProto(Map<String, ? super Object> p) |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
474 |
throws IOException { |
56882
0ec8559f599a
8210439: Unable to create an installer from a previously created app image on Windows
herrick
parents:
56869
diff
changeset
|
475 |
File appImage = StandardBundlerParam.getPredefinedAppImage(p); |
0ec8559f599a
8210439: Unable to create an installer from a previously created app image on Windows
herrick
parents:
56869
diff
changeset
|
476 |
File appDir = null; |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
477 |
|
56882
0ec8559f599a
8210439: Unable to create an installer from a previously created app image on Windows
herrick
parents:
56869
diff
changeset
|
478 |
// we either have an application image or need to build one |
0ec8559f599a
8210439: Unable to create an installer from a previously created app image on Windows
herrick
parents:
56869
diff
changeset
|
479 |
if (appImage != null) { |
56982
e094d5483bd6
8212048: Cleanup source code and fix issues discussed in preliminary review
herrick
parents:
56947
diff
changeset
|
480 |
appDir = new File( |
e094d5483bd6
8212048: Cleanup source code and fix issues discussed in preliminary review
herrick
parents:
56947
diff
changeset
|
481 |
MSI_IMAGE_DIR.fetchFrom(p), APP_NAME.fetchFrom(p)); |
56882
0ec8559f599a
8210439: Unable to create an installer from a previously created app image on Windows
herrick
parents:
56869
diff
changeset
|
482 |
// copy everything from appImage dir into appDir/name |
0ec8559f599a
8210439: Unable to create an installer from a previously created app image on Windows
herrick
parents:
56869
diff
changeset
|
483 |
IOUtils.copyRecursive(appImage.toPath(), appDir.toPath()); |
0ec8559f599a
8210439: Unable to create an installer from a previously created app image on Windows
herrick
parents:
56869
diff
changeset
|
484 |
} else { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
485 |
appDir = APP_BUNDLER.fetchFrom(p).doBundle(p, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
486 |
MSI_IMAGE_DIR.fetchFrom(p), true); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
487 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
488 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
489 |
p.put(WIN_APP_IMAGE.getID(), appDir); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
490 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
491 |
List<String> licenseFiles = LICENSE_FILE.fetchFrom(p); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
492 |
if (licenseFiles != null) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
493 |
// need to copy license file to the root of win.app.image |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
494 |
outerLoop: |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
495 |
for (RelativeFileSet rfs : APP_RESOURCES_LIST.fetchFrom(p)) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
496 |
for (String s : licenseFiles) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
497 |
if (rfs.contains(s)) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
498 |
File lfile = new File(rfs.getBaseDirectory(), s); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
499 |
File destFile = new File(appDir, lfile.getName()); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
500 |
IOUtils.copyFile(lfile, destFile); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
501 |
ensureByMutationFileIsRTF(destFile); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
502 |
break outerLoop; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
503 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
504 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
505 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
506 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
507 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
508 |
// copy file association icons |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
509 |
List<Map<String, ? super Object>> fileAssociations = |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
510 |
FILE_ASSOCIATIONS.fetchFrom(p); |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
511 |
for (Map<String, ? super Object> fa : fileAssociations) { |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
512 |
File icon = FA_ICON.fetchFrom(fa); // TODO FA_ICON_ICO |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
513 |
if (icon == null) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
514 |
continue; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
515 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
516 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
517 |
File faIconFile = new File(appDir, icon.getName()); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
518 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
519 |
if (icon.exists()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
520 |
try { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
521 |
IOUtils.copyFile(icon, faIconFile); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
522 |
} catch (IOException e) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
523 |
e.printStackTrace(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
524 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
525 |
} |
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 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
528 |
return appDir != null; |
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 |
public File bundle(Map<String, ? super Object> p, File outdir) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
532 |
if (!outdir.isDirectory() && !outdir.mkdirs()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
533 |
throw new RuntimeException(MessageFormat.format( |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
534 |
I18N.getString("error.cannot-create-output-dir"), |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
535 |
outdir.getAbsolutePath())); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
536 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
537 |
if (!outdir.canWrite()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
538 |
throw new RuntimeException(MessageFormat.format( |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
539 |
I18N.getString("error.cannot-write-to-output-dir"), |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
540 |
outdir.getAbsolutePath())); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
541 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
542 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
543 |
// validate we have valid tools before continuing |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
544 |
String light = TOOL_LIGHT_EXECUTABLE.fetchFrom(p); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
545 |
String candle = TOOL_CANDLE_EXECUTABLE.fetchFrom(p); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
546 |
if (light == null || !new File(light).isFile() || |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
547 |
candle == null || !new File(candle).isFile()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
548 |
Log.info(I18N.getString("error.no-wix-tools")); |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
549 |
Log.info(MessageFormat.format( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
550 |
I18N.getString("message.light-file-string"), light)); |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
551 |
Log.info(MessageFormat.format( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
552 |
I18N.getString("message.candle-file-string"), candle)); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
553 |
return null; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
554 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
555 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
556 |
File imageDir = MSI_IMAGE_DIR.fetchFrom(p); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
557 |
try { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
558 |
imageDir.mkdirs(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
559 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
560 |
boolean menuShortcut = MENU_HINT.fetchFrom(p); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
561 |
boolean desktopShortcut = SHORTCUT_HINT.fetchFrom(p); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
562 |
if (!menuShortcut && !desktopShortcut) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
563 |
// both can not be false - user will not find the app |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
564 |
Log.verbose(I18N.getString("message.one-shortcut-required")); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
565 |
p.put(MENU_HINT.getID(), true); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
566 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
567 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
568 |
if (prepareProto(p) && prepareWiXConfig(p) |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
569 |
&& prepareBasicProjectConfig(p)) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
570 |
File configScriptSrc = getConfig_Script(p); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
571 |
if (configScriptSrc.exists()) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
572 |
// we need to be running post script in the image folder |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
573 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
574 |
// NOTE: Would it be better to generate it to the image |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
575 |
// folder and save only if "verbose" is requested? |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
576 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
577 |
// for now we replicate it |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
578 |
File configScript = |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
579 |
new File(imageDir, configScriptSrc.getName()); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
580 |
IOUtils.copyFile(configScriptSrc, configScript); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
581 |
Log.info(MessageFormat.format( |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
582 |
I18N.getString("message.running-wsh-script"), |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
583 |
configScript.getAbsolutePath())); |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
584 |
IOUtils.run("wscript", |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
585 |
configScript, ECHO_MODE.fetchFrom(p)); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
586 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
587 |
return buildMSI(p, outdir); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
588 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
589 |
return null; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
590 |
} catch (IOException ex) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
591 |
Log.verbose(ex); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
592 |
return null; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
593 |
} finally { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
594 |
try { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
595 |
if (imageDir != null && |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
596 |
PREDEFINED_APP_IMAGE.fetchFrom(p) == null && |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
597 |
(PREDEFINED_RUNTIME_IMAGE.fetchFrom(p) == null || |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
598 |
!Arguments.CREATE_JRE_INSTALLER.fetchFrom(p)) && |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
599 |
!Log.isDebug()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
600 |
IOUtils.deleteRecursive(imageDir); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
601 |
} else if (imageDir != null) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
602 |
Log.info(MessageFormat.format( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
603 |
I18N.getString("message.debug-working-directory"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
604 |
imageDir.getAbsolutePath())); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
605 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
606 |
if (ECHO_MODE.fetchFrom(p)) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
607 |
Log.info(MessageFormat.format( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
608 |
I18N.getString("message.config-save-location"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
609 |
CONFIG_ROOT.fetchFrom(p).getAbsolutePath())); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
610 |
} else { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
611 |
cleanupConfigFiles(p); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
612 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
613 |
} catch (IOException ex) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
614 |
// noinspection ReturnInsideFinallyBlock |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
615 |
Log.debug(ex.getMessage()); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
616 |
return null; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
617 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
618 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
619 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
620 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
621 |
protected void cleanupConfigFiles(Map<String, ? super Object> params) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
622 |
if(!StandardBundlerParam.ECHO_MODE.fetchFrom(params)) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
623 |
if (getConfig_ProjectFile(params) != null) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
624 |
getConfig_ProjectFile(params).delete(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
625 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
626 |
if (getConfig_Script(params) != null) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
627 |
getConfig_Script(params).delete(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
628 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
629 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
630 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
631 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
632 |
// name of post-image script |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
633 |
private File getConfig_Script(Map<String, ? super Object> params) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
634 |
return new File(CONFIG_ROOT.fetchFrom(params), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
635 |
APP_FS_NAME.fetchFrom(params) + "-post-image.wsf"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
636 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
637 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
638 |
private boolean prepareBasicProjectConfig( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
639 |
Map<String, ? super Object> params) throws IOException { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
640 |
fetchResource(WinAppBundler.WIN_BUNDLER_PREFIX + |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
641 |
getConfig_Script(params).getName(), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
642 |
I18N.getString("resource.post-install-script"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
643 |
(String) null, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
644 |
getConfig_Script(params), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
645 |
VERBOSE.fetchFrom(params), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
646 |
DROP_IN_RESOURCES_ROOT.fetchFrom(params)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
647 |
return true; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
648 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
649 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
650 |
private String relativePath(File basedir, File file) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
651 |
return file.getAbsolutePath().substring( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
652 |
basedir.getAbsolutePath().length() + 1); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
653 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
654 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
655 |
boolean prepareMainProjectFile( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
656 |
Map<String, ? super Object> params) throws IOException { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
657 |
Map<String, String> data = new HashMap<>(); |
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 |
UUID productGUID = UUID.randomUUID(); |
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 |
Log.verbose(MessageFormat.format( |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
662 |
I18N.getString("message.generated-product-guid"), |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
663 |
productGUID.toString())); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
664 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
665 |
// we use random GUID for product itself but |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
666 |
// user provided for upgrade guid |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
667 |
// Upgrade guid is important to decide whether it is an upgrade of |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
668 |
// installed app. I.e. we need it to be the same for |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
669 |
// 2 different versions of app if possible |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
670 |
data.put("PRODUCT_GUID", productGUID.toString()); |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
671 |
data.put("PRODUCT_UPGRADE_GUID", |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
672 |
UPGRADE_UUID.fetchFrom(params).toString()); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
673 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
674 |
data.put("APPLICATION_NAME", APP_NAME.fetchFrom(params)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
675 |
data.put("APPLICATION_DESCRIPTION", DESCRIPTION.fetchFrom(params)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
676 |
data.put("APPLICATION_VENDOR", VENDOR.fetchFrom(params)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
677 |
data.put("APPLICATION_VERSION", PRODUCT_VERSION.fetchFrom(params)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
678 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
679 |
// WinAppBundler will add application folder again => step out |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
680 |
File imageRootDir = WIN_APP_IMAGE.fetchFrom(params); |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
681 |
File launcher = new File(imageRootDir, |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
682 |
WinAppBundler.getLauncherName(params)); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
683 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
684 |
String launcherPath = relativePath(imageRootDir, launcher); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
685 |
data.put("APPLICATION_LAUNCHER", launcherPath); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
686 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
687 |
String iconPath = launcherPath.replace(".exe", ".ico"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
688 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
689 |
data.put("APPLICATION_ICON", iconPath); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
690 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
691 |
data.put("REGISTRY_ROOT", getRegistryRoot(params)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
692 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
693 |
boolean canUseWix36Features = CAN_USE_WIX36.fetchFrom(params); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
694 |
data.put("WIX36_ONLY_START", |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
695 |
canUseWix36Features ? "" : "<!--"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
696 |
data.put("WIX36_ONLY_END", |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
697 |
canUseWix36Features ? "" : "-->"); |
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 |
if (MSI_SYSTEM_WIDE.fetchFrom(params)) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
700 |
data.put("INSTALL_SCOPE", "perMachine"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
701 |
} else { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
702 |
data.put("INSTALL_SCOPE", "perUser"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
703 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
704 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
705 |
if (BIT_ARCH_64.fetchFrom(params)) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
706 |
data.put("PLATFORM", "x64"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
707 |
data.put("WIN64", "yes"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
708 |
} else { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
709 |
data.put("PLATFORM", "x86"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
710 |
data.put("WIN64", "no"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
711 |
} |
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 |
data.put("UI_BLOCK", getUIBlock(params)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
714 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
715 |
List<Map<String, ? super Object>> secondaryLaunchers = |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
716 |
SECONDARY_LAUNCHERS.fetchFrom(params); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
717 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
718 |
StringBuilder secondaryLauncherIcons = new StringBuilder(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
719 |
for (int i = 0; i < secondaryLaunchers.size(); i++) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
720 |
Map<String, ? super Object> sl = secondaryLaunchers.get(i); |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
721 |
// <Icon Id="DesktopIcon.exe" SourceFile="APPLICATION_ICON" /> |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
722 |
if (SHORTCUT_HINT.fetchFrom(sl) || MENU_HINT.fetchFrom(sl)) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
723 |
File secondaryLauncher = new File(imageRootDir, |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
724 |
WinAppBundler.getLauncherName(sl)); |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
725 |
String secondaryLauncherPath = |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
726 |
relativePath(imageRootDir, secondaryLauncher); |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
727 |
String secondaryLauncherIconPath = |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
728 |
secondaryLauncherPath.replace(".exe", ".ico"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
729 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
730 |
secondaryLauncherIcons.append(" <Icon Id=\"Launcher"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
731 |
secondaryLauncherIcons.append(i); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
732 |
secondaryLauncherIcons.append(".exe\" SourceFile=\""); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
733 |
secondaryLauncherIcons.append(secondaryLauncherIconPath); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
734 |
secondaryLauncherIcons.append("\" />\r\n"); |
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 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
737 |
data.put("SECONDARY_LAUNCHER_ICONS", secondaryLauncherIcons.toString()); |
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 |
String wxs = Arguments.CREATE_JRE_INSTALLER.fetchFrom(params) ? |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
740 |
MSI_PROJECT_TEMPLATE_SERVER_JRE : MSI_PROJECT_TEMPLATE; |
56941
20568f1e1aa7
JDK-8211282: Support creation of 'exe' installers on Windows.
herrick
parents:
56882
diff
changeset
|
741 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
742 |
Writer w = new BufferedWriter( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
743 |
new FileWriter(getConfig_ProjectFile(params))); |
56941
20568f1e1aa7
JDK-8211282: Support creation of 'exe' installers on Windows.
herrick
parents:
56882
diff
changeset
|
744 |
|
20568f1e1aa7
JDK-8211282: Support creation of 'exe' installers on Windows.
herrick
parents:
56882
diff
changeset
|
745 |
String content = preprocessTextResource( |
20568f1e1aa7
JDK-8211282: Support creation of 'exe' installers on Windows.
herrick
parents:
56882
diff
changeset
|
746 |
WinAppBundler.WIN_BUNDLER_PREFIX + |
20568f1e1aa7
JDK-8211282: Support creation of 'exe' installers on Windows.
herrick
parents:
56882
diff
changeset
|
747 |
getConfig_ProjectFile(params).getName(), |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
748 |
I18N.getString("resource.wix-config-file"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
749 |
wxs, data, VERBOSE.fetchFrom(params), |
56941
20568f1e1aa7
JDK-8211282: Support creation of 'exe' installers on Windows.
herrick
parents:
56882
diff
changeset
|
750 |
DROP_IN_RESOURCES_ROOT.fetchFrom(params)); |
20568f1e1aa7
JDK-8211282: Support creation of 'exe' installers on Windows.
herrick
parents:
56882
diff
changeset
|
751 |
w.write(content); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
752 |
w.close(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
753 |
return true; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
754 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
755 |
private int id; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
756 |
private int compId; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
757 |
private final static String LAUNCHER_ID = "LauncherId"; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
758 |
private final static String LAUNCHER_SVC_ID = "LauncherSvcId"; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
759 |
|
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 |
* Overrides the dialog sequence in built-in dialog set "WixUI_InstallDir" |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
762 |
* to exclude license dialog |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
763 |
*/ |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
764 |
private static final String TWEAK_FOR_EXCLUDING_LICENSE = |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
765 |
" <Publish Dialog=\"WelcomeDlg\" Control=\"Next\"" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
766 |
+ " Event=\"NewDialog\" Value=\"InstallDirDlg\"" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
767 |
+ " Order=\"2\"> 1" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
768 |
+ " </Publish>\n" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
769 |
+ " <Publish Dialog=\"InstallDirDlg\" Control=\"Back\"" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
770 |
+ " Event=\"NewDialog\" Value=\"WelcomeDlg\"" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
771 |
+ " Order=\"2\"> 1" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
772 |
+ " </Publish>\n"; |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
773 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
774 |
/** |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
775 |
* Creates UI element using WiX built-in dialog sets |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
776 |
* - WixUI_InstallDir/WixUI_Minimal. |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
777 |
* The dialog sets are the closest to what we want to implement. |
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 |
* WixUI_Minimal for license dialog only |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
780 |
* WixUI_InstallDir for installdir dialog only or for both |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
781 |
* installdir/license dialogs |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
782 |
*/ |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
783 |
private String getUIBlock(Map<String, ? super Object> params) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
784 |
String uiBlock = " <UI/>\n"; // UI-less element |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
785 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
786 |
if (INSTALLDIR_CHOOSER.fetchFrom(params)) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
787 |
boolean enableTweakForExcludingLicense = |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
788 |
(getLicenseFile(params) == null); |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
789 |
uiBlock = " <UI>\n" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
790 |
+ " <Property Id=\"WIXUI_INSTALLDIR\"" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
791 |
+ " Value=\"APPLICATIONFOLDER\" />\n" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
792 |
+ " <UIRef Id=\"WixUI_InstallDir\" />\n" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
793 |
+ (enableTweakForExcludingLicense ? |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
794 |
TWEAK_FOR_EXCLUDING_LICENSE : "") |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
795 |
+" </UI>\n"; |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
796 |
} else if (getLicenseFile(params) != null) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
797 |
uiBlock = " <UI>\n" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
798 |
+ " <UIRef Id=\"WixUI_Minimal\" />\n" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
799 |
+ " </UI>\n"; |
56821
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 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
802 |
return uiBlock; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
803 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
804 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
805 |
private void walkFileTree(Map<String, ? super Object> params, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
806 |
File root, PrintStream out, String prefix) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
807 |
List<File> dirs = new ArrayList<>(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
808 |
List<File> files = new ArrayList<>(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
809 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
810 |
if (!root.isDirectory()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
811 |
throw new RuntimeException( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
812 |
MessageFormat.format( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
813 |
I18N.getString("error.cannot-walk-directory"), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
814 |
root.getAbsolutePath())); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
815 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
816 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
817 |
// sort to files and dirs |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
818 |
File[] children = root.listFiles(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
819 |
if (children != null) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
820 |
for (File f : children) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
821 |
if (f.isDirectory()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
822 |
dirs.add(f); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
823 |
} else { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
824 |
files.add(f); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
825 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
826 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
827 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
828 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
829 |
// have files => need to output component |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
830 |
out.println(prefix + " <Component Id=\"comp" + (compId++) |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
831 |
+ "\" DiskId=\"1\"" |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
832 |
+ " Guid=\"" + UUID.randomUUID().toString() + "\"" |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
833 |
+ (BIT_ARCH_64.fetchFrom(params) ? " Win64=\"yes\"" : "") |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
834 |
+ ">"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
835 |
out.println(prefix + " <CreateFolder/>"); |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
836 |
out.println(prefix + " <RemoveFolder Id=\"RemoveDir" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
837 |
+ (id++) + "\" On=\"uninstall\" />"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
838 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
839 |
boolean needRegistryKey = !MSI_SYSTEM_WIDE.fetchFrom(params); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
840 |
File imageRootDir = WIN_APP_IMAGE.fetchFrom(params); |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
841 |
File launcherFile = |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
842 |
new File(imageRootDir, WinAppBundler.getLauncherName(params)); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
843 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
844 |
// Find out if we need to use registry. We need it if |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
845 |
// - we doing user level install as file can not serve as KeyPath |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
846 |
// - if we adding shortcut in this component |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
847 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
848 |
for (File f: files) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
849 |
boolean isLauncher = f.equals(launcherFile); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
850 |
if (isLauncher) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
851 |
needRegistryKey = true; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
852 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
853 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
854 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
855 |
if (needRegistryKey) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
856 |
// has to be under HKCU to make WiX happy |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
857 |
out.println(prefix + " <RegistryKey Root=\"HKCU\" " |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
858 |
+ " Key=\"Software\\" + VENDOR.fetchFrom(params) + "\\" |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
859 |
+ APP_NAME.fetchFrom(params) + "\"" |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
860 |
+ (CAN_USE_WIX36.fetchFrom(params) ? |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
861 |
">" : " Action=\"createAndRemoveOnUninstall\">")); |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
862 |
out.println(prefix |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
863 |
+ " <RegistryValue Name=\"Version\" Value=\"" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
864 |
+ VERSION.fetchFrom(params) |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
865 |
+ "\" Type=\"string\" KeyPath=\"yes\"/>"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
866 |
out.println(prefix + " </RegistryKey>"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
867 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
868 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
869 |
boolean menuShortcut = MENU_HINT.fetchFrom(params); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
870 |
boolean desktopShortcut = SHORTCUT_HINT.fetchFrom(params); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
871 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
872 |
Map<String, String> idToFileMap = new TreeMap<>(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
873 |
boolean launcherSet = false; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
874 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
875 |
for (File f : files) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
876 |
boolean isLauncher = f.equals(launcherFile); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
877 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
878 |
launcherSet = launcherSet || isLauncher; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
879 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
880 |
boolean doShortcuts = |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
881 |
isLauncher && (menuShortcut || desktopShortcut); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
882 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
883 |
String thisFileId = isLauncher ? LAUNCHER_ID : ("FileId" + (id++)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
884 |
idToFileMap.put(f.getName(), thisFileId); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
885 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
886 |
out.println(prefix + " <File Id=\"" + |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
887 |
thisFileId + "\"" |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
888 |
+ " Name=\"" + f.getName() + "\" " |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
889 |
+ " Source=\"" + relativePath(imageRootDir, f) + "\"" |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
890 |
+ (BIT_ARCH_64.fetchFrom(params) ? |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
891 |
" ProcessorArchitecture=\"x64\"" : "") + ">"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
892 |
if (doShortcuts && desktopShortcut) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
893 |
out.println(prefix |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
894 |
+ " <Shortcut Id=\"desktopShortcut\" Directory=" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
895 |
+ "\"DesktopFolder\"" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
896 |
+ " Name=\"" + APP_NAME.fetchFrom(params) |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
897 |
+ "\" WorkingDirectory=\"INSTALLDIR\"" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
898 |
+ " Advertise=\"no\" Icon=\"DesktopIcon.exe\"" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
899 |
+ " IconIndex=\"0\" />"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
900 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
901 |
if (doShortcuts && menuShortcut) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
902 |
out.println(prefix |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
903 |
+ " <Shortcut Id=\"ExeShortcut\" Directory=" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
904 |
+ "\"ProgramMenuDir\"" |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
905 |
+ " Name=\"" + APP_NAME.fetchFrom(params) |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
906 |
+ "\" Advertise=\"no\" Icon=\"StartMenuIcon.exe\"" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
907 |
+ " IconIndex=\"0\" />"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
908 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
909 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
910 |
List<Map<String, ? super Object>> secondaryLaunchers = |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
911 |
SECONDARY_LAUNCHERS.fetchFrom(params); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
912 |
for (int i = 0; i < secondaryLaunchers.size(); i++) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
913 |
Map<String, ? super Object> sl = secondaryLaunchers.get(i); |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
914 |
File secondaryLauncherFile = new File(imageRootDir, |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
915 |
WinAppBundler.getLauncherName(sl)); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
916 |
if (f.equals(secondaryLauncherFile)) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
917 |
if (SHORTCUT_HINT.fetchFrom(sl)) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
918 |
out.println(prefix |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
919 |
+ " <Shortcut Id=\"desktopShortcut" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
920 |
+ i + "\" Directory=\"DesktopFolder\"" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
921 |
+ " Name=\"" + APP_NAME.fetchFrom(sl) |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
922 |
+ "\" WorkingDirectory=\"INSTALLDIR\"" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
923 |
+ " Advertise=\"no\" Icon=\"Launcher" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
924 |
+ i + ".exe\" IconIndex=\"0\" />"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
925 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
926 |
if (MENU_HINT.fetchFrom(sl)) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
927 |
out.println(prefix |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
928 |
+ " <Shortcut Id=\"ExeShortcut" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
929 |
+ i + "\" Directory=\"ProgramMenuDir\"" |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
930 |
+ " Name=\"" + APP_NAME.fetchFrom(sl) |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
931 |
+ "\" Advertise=\"no\" Icon=\"Launcher" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
932 |
+ i + ".exe\" IconIndex=\"0\" />"); |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
933 |
// Should we allow different menu groups? Not for now. |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
934 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
935 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
936 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
937 |
out.println(prefix + " </File>"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
938 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
939 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
940 |
if (launcherSet) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
941 |
List<Map<String, ? super Object>> fileAssociations = |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
942 |
FILE_ASSOCIATIONS.fetchFrom(params); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
943 |
String regName = APP_REGISTRY_NAME.fetchFrom(params); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
944 |
Set<String> defaultedMimes = new TreeSet<>(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
945 |
int count = 0; |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
946 |
for (Map<String, ? super Object> fa : fileAssociations) { |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
947 |
String description = FA_DESCRIPTION.fetchFrom(fa); |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
948 |
List<String> extensions = FA_EXTENSIONS.fetchFrom(fa); |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
949 |
List<String> mimeTypes = FA_CONTENT_TYPE.fetchFrom(fa); |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
950 |
File icon = FA_ICON.fetchFrom(fa); // TODO FA_ICON_ICO |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
951 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
952 |
String mime = (mimeTypes == null || |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
953 |
mimeTypes.isEmpty()) ? null : mimeTypes.get(0); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
954 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
955 |
if (extensions == null) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
956 |
Log.info(I18N.getString( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
957 |
"message.creating-association-with-null-extension")); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
958 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
959 |
String entryName = regName + "File"; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
960 |
if (count > 0) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
961 |
entryName += "." + count; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
962 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
963 |
count++; |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
964 |
out.print(prefix + " <ProgId Id='" + entryName |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
965 |
+ "' Description='" + description + "'"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
966 |
if (icon != null && icon.exists()) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
967 |
out.print(" Icon='" + idToFileMap.get(icon.getName()) |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
968 |
+ "' IconIndex='0'"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
969 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
970 |
out.println(" />"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
971 |
} else { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
972 |
for (String ext : extensions) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
973 |
String entryName = regName + "File"; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
974 |
if (count > 0) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
975 |
entryName += "." + count; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
976 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
977 |
count++; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
978 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
979 |
out.print(prefix + " <ProgId Id='" + entryName |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
980 |
+ "' Description='" + description + "'"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
981 |
if (icon != null && icon.exists()) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
982 |
out.print(" Icon='" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
983 |
+ idToFileMap.get(icon.getName()) |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
984 |
+ "' IconIndex='0'"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
985 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
986 |
out.println(">"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
987 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
988 |
if (extensions == null) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
989 |
Log.info(I18N.getString( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
990 |
"message.creating-association-with-null-extension")); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
991 |
} else { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
992 |
out.print(prefix + " <Extension Id='" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
993 |
+ ext + "' Advertise='no'"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
994 |
if (mime == null) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
995 |
out.println(">"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
996 |
} else { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
997 |
out.println(" ContentType='" + mime + "'>"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
998 |
if (!defaultedMimes.contains(mime)) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
999 |
out.println(prefix |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1000 |
+ " <MIME ContentType='" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1001 |
+ mime + "' Default='yes' />"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1002 |
defaultedMimes.add(mime); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1003 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1004 |
} |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1005 |
out.println(prefix |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1006 |
+ " <Verb Id='open' Command='Open' " |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1007 |
+ "TargetFile='" + LAUNCHER_ID |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1008 |
+ "' Argument='\"%1\"' />"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1009 |
out.println(prefix + " </Extension>"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1010 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1011 |
out.println(prefix + " </ProgId>"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1012 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1013 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1014 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1015 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1016 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1017 |
out.println(prefix + " </Component>"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1018 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1019 |
for (File d : dirs) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1020 |
out.println(prefix + " <Directory Id=\"dirid" + (id++) |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1021 |
+ "\" Name=\"" + d.getName() + "\">"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1022 |
walkFileTree(params, d, out, prefix + " "); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1023 |
out.println(prefix + " </Directory>"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1024 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1025 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1026 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1027 |
String getRegistryRoot(Map<String, ? super Object> params) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1028 |
if (MSI_SYSTEM_WIDE.fetchFrom(params)) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1029 |
return "HKLM"; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1030 |
} else { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1031 |
return "HKCU"; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1032 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1033 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1034 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1035 |
boolean prepareContentList(Map<String, ? super Object> params) |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1036 |
throws FileNotFoundException { |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1037 |
File f = new File( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1038 |
CONFIG_ROOT.fetchFrom(params), MSI_PROJECT_CONTENT_FILE); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1039 |
PrintStream out = new PrintStream(f); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1040 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1041 |
// opening |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1042 |
out.println("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1043 |
out.println("<Include>"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1044 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1045 |
out.println(" <Directory Id=\"TARGETDIR\" Name=\"SourceDir\">"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1046 |
if (MSI_SYSTEM_WIDE.fetchFrom(params)) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1047 |
// install to programfiles |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1048 |
if (BIT_ARCH_64.fetchFrom(params)) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1049 |
out.println(" <Directory Id=\"ProgramFiles64Folder\" " |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1050 |
+ "Name=\"PFiles\">"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1051 |
} else { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1052 |
out.println(" <Directory Id=\"ProgramFilesFolder\" " |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1053 |
+ "Name=\"PFiles\">"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1054 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1055 |
} else { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1056 |
// install to user folder |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1057 |
out.println( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1058 |
" <Directory Name=\"AppData\" Id=\"LocalAppDataFolder\">"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1059 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1060 |
out.println(" <Directory Id=\"APPLICATIONFOLDER\" Name=\"" |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1061 |
+ APP_NAME.fetchFrom(params) + "\">"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1062 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1063 |
// dynamic part |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1064 |
id = 0; |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1065 |
compId = 0; // reset counters |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1066 |
walkFileTree(params, WIN_APP_IMAGE.fetchFrom(params), out, " "); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1067 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1068 |
// closing |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1069 |
out.println(" </Directory>"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1070 |
out.println(" </Directory>"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1071 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1072 |
// for shortcuts |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1073 |
if (SHORTCUT_HINT.fetchFrom(params)) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1074 |
out.println(" <Directory Id=\"DesktopFolder\" />"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1075 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1076 |
if (MENU_HINT.fetchFrom(params)) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1077 |
out.println(" <Directory Id=\"ProgramMenuFolder\">"); |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1078 |
out.println(" <Directory Id=\"ProgramMenuDir\" Name=\"" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1079 |
+ MENU_GROUP.fetchFrom(params) + "\">"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1080 |
out.println(" <Component Id=\"comp" + (compId++) + "\"" |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1081 |
+ " Guid=\"" + UUID.randomUUID().toString() + "\"" |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1082 |
+ (BIT_ARCH_64.fetchFrom(params) ? " Win64=\"yes\"" : "") |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1083 |
+ ">"); |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1084 |
out.println(" <RemoveFolder Id=\"ProgramMenuDir\" " |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1085 |
+ "On=\"uninstall\" />"); |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1086 |
// This has to be under HKCU to make WiX happy. |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1087 |
// There are numberous discussions on this amoung WiX users |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1088 |
// (if user A installs and user B uninstalls key is left behind) |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1089 |
// there are suggested workarounds but none of them are appealing. |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1090 |
// Leave it for now |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1091 |
out.println( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1092 |
" <RegistryValue Root=\"HKCU\" Key=\"Software\\" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1093 |
+ VENDOR.fetchFrom(params) + "\\" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1094 |
+ APP_NAME.fetchFrom(params) |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1095 |
+ "\" Type=\"string\" Value=\"\" />"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1096 |
out.println(" </Component>"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1097 |
out.println(" </Directory>"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1098 |
out.println(" </Directory>"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1099 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1100 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1101 |
out.println(" </Directory>"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1102 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1103 |
out.println(" <Feature Id=\"DefaultFeature\" " |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1104 |
+ "Title=\"Main Feature\" Level=\"1\">"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1105 |
for (int j = 0; j < compId; j++) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1106 |
out.println(" <ComponentRef Id=\"comp" + j + "\" />"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1107 |
} |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1108 |
// component is defined in the template.wsx |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1109 |
out.println(" <ComponentRef Id=\"CleanupMainApplicationFolder\" />"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1110 |
out.println(" </Feature>"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1111 |
out.println("</Include>"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1112 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1113 |
out.close(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1114 |
return true; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1115 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1116 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1117 |
private File getConfig_ProjectFile(Map<String, ? super Object> params) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1118 |
return new File(CONFIG_ROOT.fetchFrom(params), |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1119 |
APP_NAME.fetchFrom(params) + ".wxs"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1120 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1121 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1122 |
private String getLicenseFile(Map<String, ? super Object> params) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1123 |
List<String> licenseFiles = LICENSE_FILE.fetchFrom(params); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1124 |
if (licenseFiles == null || licenseFiles.isEmpty()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1125 |
return null; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1126 |
} else { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1127 |
return licenseFiles.get(0); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1128 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1129 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1130 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1131 |
private boolean prepareWiXConfig( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1132 |
Map<String, ? super Object> params) throws IOException { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1133 |
return prepareMainProjectFile(params) && prepareContentList(params); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1134 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1135 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1136 |
private final static String MSI_PROJECT_TEMPLATE = "template.wxs"; |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1137 |
private final static String MSI_PROJECT_TEMPLATE_SERVER_JRE = |
56947
5a03c4524b90
JDK-8211857: Support "exe" format for create-jre-installers
herrick
parents:
56941
diff
changeset
|
1138 |
"template.jre.wxs"; |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1139 |
private final static String MSI_PROJECT_CONTENT_FILE = "bundle.wxi"; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1140 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1141 |
private File buildMSI(Map<String, ? super Object> params, File outdir) |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1142 |
throws IOException { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1143 |
File tmpDir = new File(BUILD_ROOT.fetchFrom(params), "tmp"); |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1144 |
File candleOut = new File( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1145 |
tmpDir, APP_NAME.fetchFrom(params) +".wixobj"); |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1146 |
File msiOut = new File( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1147 |
outdir, INSTALLER_FILE_NAME.fetchFrom(params) + ".msi"); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1148 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1149 |
Log.verbose(MessageFormat.format(I18N.getString( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1150 |
"message.preparing-msi-config"), msiOut.getAbsolutePath())); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1151 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1152 |
msiOut.getParentFile().mkdirs(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1153 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1154 |
// run candle |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1155 |
ProcessBuilder pb = new ProcessBuilder( |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1156 |
TOOL_CANDLE_EXECUTABLE.fetchFrom(params), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1157 |
"-nologo", |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1158 |
getConfig_ProjectFile(params).getAbsolutePath(), |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1159 |
"-ext", "WixUtilExtension", |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1160 |
"-out", candleOut.getAbsolutePath()); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1161 |
pb = pb.directory(WIN_APP_IMAGE.fetchFrom(params)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1162 |
IOUtils.exec(pb, ECHO_MODE.fetchFrom(params)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1163 |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1164 |
Log.verbose(MessageFormat.format(I18N.getString( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1165 |
"message.generating-msi"), msiOut.getAbsolutePath())); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1166 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1167 |
boolean enableLicenseUI = (getLicenseFile(params) != null); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1168 |
boolean enableInstalldirUI = INSTALLDIR_CHOOSER.fetchFrom(params); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1169 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1170 |
List<String> commandLine = new ArrayList<>(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1171 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1172 |
commandLine.add(TOOL_LIGHT_EXECUTABLE.fetchFrom(params)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1173 |
if (enableLicenseUI) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1174 |
commandLine.add("-dWixUILicenseRtf="+getLicenseFile(params)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1175 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1176 |
commandLine.add("-nologo"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1177 |
commandLine.add("-spdb"); |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1178 |
commandLine.add("-sice:60"); |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1179 |
// ignore warnings due to "missing launcguage info" (ICE60) |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1180 |
commandLine.add(candleOut.getAbsolutePath()); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1181 |
commandLine.add("-ext"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1182 |
commandLine.add("WixUtilExtension"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1183 |
if (enableLicenseUI || enableInstalldirUI) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1184 |
commandLine.add("-ext"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1185 |
commandLine.add("WixUIExtension.dll"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1186 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1187 |
commandLine.add("-out"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1188 |
commandLine.add(msiOut.getAbsolutePath()); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1189 |
|
56982
e094d5483bd6
8212048: Cleanup source code and fix issues discussed in preliminary review
herrick
parents:
56947
diff
changeset
|
1190 |
// create .msi |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1191 |
pb = new ProcessBuilder(commandLine); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1192 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1193 |
pb = pb.directory(WIN_APP_IMAGE.fetchFrom(params)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1194 |
IOUtils.exec(pb, ECHO_MODE.fetchFrom(params)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1195 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1196 |
candleOut.delete(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1197 |
IOUtils.deleteRecursive(tmpDir); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1198 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1199 |
return msiOut; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1200 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1201 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1202 |
public static void ensureByMutationFileIsRTF(File f) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1203 |
if (f == null || !f.isFile()) return; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1204 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1205 |
try { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1206 |
boolean existingLicenseIsRTF = false; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1207 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1208 |
try (FileInputStream fin = new FileInputStream(f)) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1209 |
byte[] firstBits = new byte[7]; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1210 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1211 |
if (fin.read(firstBits) == firstBits.length) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1212 |
String header = new String(firstBits); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1213 |
existingLicenseIsRTF = "{\\rtf1\\".equals(header); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1214 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1215 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1216 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1217 |
if (!existingLicenseIsRTF) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1218 |
List<String> oldLicense = Files.readAllLines(f.toPath()); |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1219 |
try (Writer w = Files.newBufferedWriter( |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1220 |
f.toPath(), Charset.forName("Windows-1252"))) { |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1221 |
w.write("{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1222 |
+ "{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\n" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1223 |
+ "\\viewkind4\\uc1\\pard\\sa200\\sl276" |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1224 |
+ "\\slmult1\\lang9\\fs20 "); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1225 |
oldLicense.forEach(l -> { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1226 |
try { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1227 |
for (char c : l.toCharArray()) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1228 |
// 0x00 <= ch < 0x20 Escaped (\'hh) |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1229 |
// 0x20 <= ch < 0x80 Raw(non - escaped) char |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1230 |
// 0x80 <= ch <= 0xFF Escaped(\ 'hh) |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1231 |
// 0x5C, 0x7B, 0x7D (special RTF characters |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1232 |
// \,{,})Escaped(\'hh) |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1233 |
// ch > 0xff Escaped (\\ud###?) |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1234 |
if (c < 0x10) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1235 |
w.write("\\'0"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1236 |
w.write(Integer.toHexString(c)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1237 |
} else if (c > 0xff) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1238 |
w.write("\\ud"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1239 |
w.write(Integer.toString(c)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1240 |
// \\uc1 is in the header and in effect |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1241 |
// so we trail with a replacement char if |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1242 |
// the font lacks that character - '?' |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1243 |
w.write("?"); |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1244 |
} else if ((c < 0x20) || (c >= 0x80) || |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1245 |
(c == 0x5C) || (c == 0x7B) || |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56851
diff
changeset
|
1246 |
(c == 0x7D)) { |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1247 |
w.write("\\'"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1248 |
w.write(Integer.toHexString(c)); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1249 |
} else { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1250 |
w.write(c); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1251 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1252 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1253 |
// blank lines are interpreted as paragraph breaks |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1254 |
if (l.length() < 1) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1255 |
w.write("\\par"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1256 |
} else { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1257 |
w.write(" "); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1258 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1259 |
w.write("\r\n"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1260 |
} catch (IOException e) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1261 |
Log.verbose(e); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1262 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1263 |
}); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1264 |
w.write("}\r\n"); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1265 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1266 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1267 |
} catch (IOException e) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1268 |
Log.verbose(e); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1269 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1270 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1271 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1272 |
} |