author | herrick |
Fri, 18 Oct 2019 14:14:37 -0400 | |
branch | JDK-8200758-branch |
changeset 58696 | 61c44899b4eb |
parent 58417 | 67ffaf3a2b75 |
child 58762 | 0fe62353385b |
permissions | -rw-r--r-- |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
1 |
/* |
57106
ea870b9ce89a
8216492: Update copyright of all new jpackage fils to 2019
kcr
parents:
57077
diff
changeset
|
2 |
* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
4 |
* |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. Oracle designates this |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
8 |
* particular file as subject to the "Classpath" exception as provided |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
10 |
* |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
15 |
* accompanied this code). |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
16 |
* |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
17 |
* You should have received a copy of the GNU General Public License version |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
20 |
* |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
22 |
* or visit www.oracle.com if you need additional information or have any |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
23 |
* questions. |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
24 |
*/ |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
25 |
|
57039 | 26 |
package jdk.jpackage.internal; |
56821
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 java.io.*; |
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
29 |
import java.lang.reflect.InvocationHandler; |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
30 |
import java.lang.reflect.Method; |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
31 |
import java.lang.reflect.Proxy; |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
32 |
import java.nio.channels.FileChannel; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
33 |
import java.nio.file.FileVisitResult; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
34 |
import java.nio.file.Files; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
35 |
import java.nio.file.Path; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
36 |
import java.nio.file.SimpleFileVisitor; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
37 |
import java.nio.file.attribute.BasicFileAttributes; |
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
38 |
import java.util.*; |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
39 |
import javax.xml.stream.XMLOutputFactory; |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
40 |
import javax.xml.stream.XMLStreamException; |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
41 |
import javax.xml.stream.XMLStreamWriter; |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
42 |
|
56994
b4aca2dbe2b5
8212537: Create method and class description comments for main functionality
herrick
parents:
56989
diff
changeset
|
43 |
/** |
b4aca2dbe2b5
8212537: Create method and class description comments for main functionality
herrick
parents:
56989
diff
changeset
|
44 |
* IOUtils |
b4aca2dbe2b5
8212537: Create method and class description comments for main functionality
herrick
parents:
56989
diff
changeset
|
45 |
* |
b4aca2dbe2b5
8212537: Create method and class description comments for main functionality
herrick
parents:
56989
diff
changeset
|
46 |
* A collection of static utility methods. |
b4aca2dbe2b5
8212537: Create method and class description comments for main functionality
herrick
parents:
56989
diff
changeset
|
47 |
*/ |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
48 |
public class IOUtils { |
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 void deleteRecursive(File path) throws IOException { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
51 |
if (!path.exists()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
52 |
return; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
53 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
54 |
Path directory = path.toPath(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
55 |
Files.walkFileTree(directory, new SimpleFileVisitor<Path>() { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
56 |
@Override |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
57 |
public FileVisitResult visitFile(Path file, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
58 |
BasicFileAttributes attr) throws IOException { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
59 |
if (Platform.getPlatform() == Platform.WINDOWS) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
60 |
Files.setAttribute(file, "dos:readonly", false); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
61 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
62 |
Files.delete(file); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
63 |
return FileVisitResult.CONTINUE; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
64 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
65 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
66 |
@Override |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
67 |
public FileVisitResult preVisitDirectory(Path dir, |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
68 |
BasicFileAttributes attr) throws IOException { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
69 |
if (Platform.getPlatform() == Platform.WINDOWS) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
70 |
Files.setAttribute(dir, "dos:readonly", false); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
71 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
72 |
return FileVisitResult.CONTINUE; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
73 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
74 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
75 |
@Override |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
76 |
public FileVisitResult postVisitDirectory(Path dir, IOException e) |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
77 |
throws IOException { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
78 |
Files.delete(dir); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
79 |
return FileVisitResult.CONTINUE; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
80 |
} |
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 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
83 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
84 |
public static void copyRecursive(Path src, Path dest) throws IOException { |
58301
e0efb29609bd
8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
57446
diff
changeset
|
85 |
copyRecursive(src, dest, List.of()); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
86 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
87 |
|
57077
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
88 |
public static void copyRecursive(Path src, Path dest, |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
89 |
final List<String> excludes) throws IOException { |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
90 |
Files.walkFileTree(src, new SimpleFileVisitor<Path>() { |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
91 |
@Override |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
92 |
public FileVisitResult preVisitDirectory(final Path dir, |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
93 |
final BasicFileAttributes attrs) throws IOException { |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
94 |
if (excludes.contains(dir.toFile().getName())) { |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
95 |
return FileVisitResult.SKIP_SUBTREE; |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
96 |
} else { |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
97 |
Files.createDirectories(dest.resolve(src.relativize(dir))); |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
98 |
return FileVisitResult.CONTINUE; |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
99 |
} |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
100 |
} |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
101 |
|
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
102 |
@Override |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
103 |
public FileVisitResult visitFile(final Path file, |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
104 |
final BasicFileAttributes attrs) throws IOException { |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
105 |
if (!excludes.contains(file.toFile().getName())) { |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
106 |
Files.copy(file, dest.resolve(src.relativize(file))); |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
107 |
} |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
108 |
return FileVisitResult.CONTINUE; |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
109 |
} |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
110 |
}); |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
111 |
} |
8f9cf6ad59f0
8213962: JPackageCreateImageRuntimeModuleTest fails
herrick
parents:
57039
diff
changeset
|
112 |
|
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
113 |
public static void copyFile(File sourceFile, File destFile) |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
114 |
throws IOException { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
115 |
destFile.getParentFile().mkdirs(); |
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 |
//recreate the file as existing copy may have weird permissions |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
118 |
destFile.delete(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
119 |
destFile.createNewFile(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
120 |
|
57390 | 121 |
try (FileChannel source = new FileInputStream(sourceFile).getChannel(); |
122 |
FileChannel destination = |
|
123 |
new FileOutputStream(destFile).getChannel()) { |
|
124 |
||
125 |
if (destination != null && source != null) { |
|
126 |
destination.transferFrom(source, 0, source.size()); |
|
127 |
} |
|
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
128 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
129 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
130 |
//preserve executable bit! |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
131 |
if (sourceFile.canExecute()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
132 |
destFile.setExecutable(true, false); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
133 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
134 |
if (!sourceFile.canWrite()) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
135 |
destFile.setReadOnly(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
136 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
137 |
destFile.setReadable(true, false); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
138 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
139 |
|
56982
e094d5483bd6
8212048: Cleanup source code and fix issues discussed in preliminary review
herrick
parents:
56869
diff
changeset
|
140 |
// run "launcher paramfile" in the directory where paramfile is kept |
57391 | 141 |
public static void run(String launcher, File paramFile) |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
142 |
throws IOException { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
143 |
if (paramFile != null && paramFile.exists()) { |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56821
diff
changeset
|
144 |
ProcessBuilder pb = |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56821
diff
changeset
|
145 |
new ProcessBuilder(launcher, paramFile.getName()); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
146 |
pb = pb.directory(paramFile.getParentFile()); |
57391 | 147 |
exec(pb); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
148 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
149 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
150 |
|
57391 | 151 |
public static void exec(ProcessBuilder pb) |
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56821
diff
changeset
|
152 |
throws IOException { |
57391 | 153 |
exec(pb, false, null); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
154 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
155 |
|
58417
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
58301
diff
changeset
|
156 |
static void exec(ProcessBuilder pb, boolean testForPresenseOnly, |
57391 | 157 |
PrintStream consumer) throws IOException { |
58417
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
58301
diff
changeset
|
158 |
List<String> output = new ArrayList<>(); |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
58301
diff
changeset
|
159 |
Executor exec = Executor.of(pb).setOutputConsumer(lines -> { |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
58301
diff
changeset
|
160 |
lines.forEach(output::add); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
161 |
if (consumer != null) { |
58417
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
58301
diff
changeset
|
162 |
output.forEach(consumer::println); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
163 |
} |
58417
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
58301
diff
changeset
|
164 |
}); |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
58301
diff
changeset
|
165 |
|
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
58301
diff
changeset
|
166 |
if (testForPresenseOnly) { |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
58301
diff
changeset
|
167 |
exec.execute(); |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
58301
diff
changeset
|
168 |
} else { |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
58301
diff
changeset
|
169 |
exec.executeExpectSuccess(); |
56821
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 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
172 |
|
57391 | 173 |
public static int getProcessOutput(List<String> result, String... args) |
174 |
throws IOException, InterruptedException { |
|
175 |
||
176 |
ProcessBuilder pb = new ProcessBuilder(args); |
|
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
177 |
|
57391 | 178 |
final Process p = pb.start(); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
179 |
|
57391 | 180 |
List<String> list = new ArrayList<>(); |
181 |
||
182 |
final BufferedReader in = |
|
183 |
new BufferedReader(new InputStreamReader(p.getInputStream())); |
|
56869
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56821
diff
changeset
|
184 |
final BufferedReader err = |
41e17fe9fbeb
8208522: removed unreferenced class and minor formatting of java source
herrick
parents:
56821
diff
changeset
|
185 |
new BufferedReader(new InputStreamReader(p.getErrorStream())); |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
186 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
187 |
Thread t = new Thread(() -> { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
188 |
try { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
189 |
String line; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
190 |
while ((line = in.readLine()) != null) { |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
191 |
list.add(line); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
192 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
193 |
} catch (IOException ioe) { |
57391 | 194 |
Log.verbose(ioe); |
195 |
} |
|
196 |
||
197 |
try { |
|
198 |
String line; |
|
199 |
while ((line = err.readLine()) != null) { |
|
200 |
Log.error(line); |
|
201 |
} |
|
202 |
} catch (IOException ioe) { |
|
203 |
Log.verbose(ioe); |
|
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
204 |
} |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
205 |
}); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
206 |
t.setDaemon(true); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
207 |
t.start(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
208 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
209 |
int ret = p.waitFor(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
210 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
211 |
result.clear(); |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
212 |
result.addAll(list); |
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 |
return ret; |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
215 |
} |
57407 | 216 |
|
217 |
static void writableOutputDir(Path outdir) throws PackagerException { |
|
218 |
File file = outdir.toFile(); |
|
219 |
||
220 |
if (!file.isDirectory() && !file.mkdirs()) { |
|
221 |
throw new PackagerException("error.cannot-create-output-dir", |
|
222 |
file.getAbsolutePath()); |
|
223 |
} |
|
224 |
if (!file.canWrite()) { |
|
225 |
throw new PackagerException("error.cannot-write-to-output-dir", |
|
226 |
file.getAbsolutePath()); |
|
227 |
} |
|
228 |
} |
|
58696
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
229 |
|
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
230 |
public static Path replaceSuffix(Path path, String suffix) { |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
231 |
Path parent = path.getParent(); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
232 |
String filename = path.getFileName().toString().replaceAll("\\.[^.]*$", "") |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
233 |
+ Optional.ofNullable(suffix).orElse(""); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
234 |
return parent != null ? parent.resolve(filename) : Path.of(filename); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
235 |
} |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
236 |
|
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
237 |
public static Path addSuffix(Path path, String suffix) { |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
238 |
Path parent = path.getParent(); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
239 |
String filename = path.getFileName().toString() + suffix; |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
240 |
return parent != null ? parent.resolve(filename) : Path.of(filename); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
241 |
} |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
242 |
|
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
243 |
@FunctionalInterface |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
244 |
public static interface XmlConsumer { |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
245 |
void accept(XMLStreamWriter xml) throws IOException, XMLStreamException; |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
246 |
} |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
247 |
|
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
248 |
public static void createXml(Path dstFile, XmlConsumer xmlConsumer) throws |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
249 |
IOException { |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
250 |
XMLOutputFactory xmlFactory = XMLOutputFactory.newInstance(); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
251 |
try (Writer w = new BufferedWriter(new FileWriter(dstFile.toFile()))) { |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
252 |
// Wrap with pretty print proxy |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
253 |
XMLStreamWriter xml = (XMLStreamWriter) Proxy.newProxyInstance( |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
254 |
XMLStreamWriter.class.getClassLoader(), new Class<?>[]{ |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
255 |
XMLStreamWriter.class}, new PrettyPrintHandler( |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
256 |
xmlFactory.createXMLStreamWriter(w))); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
257 |
|
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
258 |
xml.writeStartDocument(); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
259 |
xmlConsumer.accept(xml); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
260 |
xml.writeEndDocument(); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
261 |
xml.flush(); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
262 |
xml.close(); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
263 |
} catch (XMLStreamException ex) { |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
264 |
throw new IOException(ex); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
265 |
} catch (IOException ex) { |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
266 |
throw ex; |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
267 |
} |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
268 |
} |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
269 |
|
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
270 |
private static class PrettyPrintHandler implements InvocationHandler { |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
271 |
|
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
272 |
PrettyPrintHandler(XMLStreamWriter target) { |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
273 |
this.target = target; |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
274 |
} |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
275 |
|
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
276 |
@Override |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
277 |
public Object invoke(Object proxy, Method method, Object[] args) throws |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
278 |
Throwable { |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
279 |
switch (method.getName()) { |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
280 |
case "writeStartElement": |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
281 |
// update state of parent node |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
282 |
if (depth > 0) { |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
283 |
hasChildElement.put(depth - 1, true); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
284 |
} |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
285 |
// reset state of current node |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
286 |
hasChildElement.put(depth, false); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
287 |
// indent for current depth |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
288 |
target.writeCharacters(EOL); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
289 |
target.writeCharacters(repeat(depth, INDENT)); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
290 |
depth++; |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
291 |
break; |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
292 |
case "writeEndElement": |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
293 |
depth--; |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
294 |
if (hasChildElement.get(depth) == true) { |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
295 |
target.writeCharacters(EOL); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
296 |
target.writeCharacters(repeat(depth, INDENT)); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
297 |
} |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
298 |
break; |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
299 |
case "writeProcessingInstruction": |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
300 |
case "writeEmptyElement": |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
301 |
// update state of parent node |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
302 |
if (depth > 0) { |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
303 |
hasChildElement.put(depth - 1, true); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
304 |
} |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
305 |
// indent for current depth |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
306 |
target.writeCharacters(EOL); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
307 |
target.writeCharacters(repeat(depth, INDENT)); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
308 |
break; |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
309 |
default: |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
310 |
break; |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
311 |
} |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
312 |
method.invoke(target, args); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
313 |
return null; |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
314 |
} |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
315 |
|
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
316 |
private static String repeat(int d, String s) { |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
317 |
StringBuilder sb = new StringBuilder(); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
318 |
while (d-- > 0) { |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
319 |
sb.append(s); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
320 |
} |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
321 |
return sb.toString(); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
322 |
} |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
323 |
|
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
324 |
private final XMLStreamWriter target; |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
325 |
private int depth = 0; |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
326 |
private final Map<Integer, Boolean> hasChildElement = new HashMap<>(); |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
327 |
private static final String INDENT = " "; |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
328 |
private static final String EOL = "\n"; |
61c44899b4eb
8223325: Improve wix sources generated by jpackage
herrick
parents:
58417
diff
changeset
|
329 |
} |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
diff
changeset
|
330 |
} |