|
0 |
Description: Drops pack200 compression support to build with OpenJDK 17
|
|
1 |
Author: Emmanuel Bourg <ebourg@apache.org>
|
|
2 |
Forwarded: not-needed
|
|
3 |
--- a/src/java/org/lwjgl/util/applet/AppletLoader.java
|
|
4 |
+++ b/src/java/org/lwjgl/util/applet/AppletLoader.java
|
|
5 |
@@ -85,7 +85,6 @@
|
|
6 |
import java.util.jar.JarEntry;
|
|
7 |
import java.util.jar.JarFile;
|
|
8 |
import java.util.jar.JarOutputStream;
|
|
9 |
-import java.util.jar.Pack200;
|
|
10 |
import java.util.zip.CRC32;
|
|
11 |
import java.util.zip.CheckedInputStream;
|
|
12 |
import java.util.zip.GZIPInputStream;
|
|
13 |
@@ -374,14 +373,6 @@
|
|
14 |
} catch (Throwable e) {
|
|
15 |
/* no lzma support */
|
|
16 |
}
|
|
17 |
-
|
|
18 |
- // check pack200 support
|
|
19 |
- try {
|
|
20 |
- java.util.jar.Pack200.class.getSimpleName();
|
|
21 |
- pack200Supported = true;
|
|
22 |
- } catch (Throwable e) {
|
|
23 |
- /* no pack200 support */
|
|
24 |
- }
|
|
25 |
}
|
|
26 |
|
|
27 |
/**
|
|
28 |
@@ -1674,29 +1665,6 @@
|
|
29 |
}
|
|
30 |
|
|
31 |
/**
|
|
32 |
- * Extract Pack File
|
|
33 |
- * @param in Input path to pack file
|
|
34 |
- * @param out output path to resulting file
|
|
35 |
- * @throws Exception if any errors occur
|
|
36 |
- */
|
|
37 |
- protected void extractPack(String in, String out) throws Exception {
|
|
38 |
- File f = new File(in);
|
|
39 |
- FileOutputStream fostream = new FileOutputStream(out);
|
|
40 |
- JarOutputStream jostream = new JarOutputStream(fostream);
|
|
41 |
-
|
|
42 |
- try {
|
|
43 |
- Pack200.Unpacker unpacker = Pack200.newUnpacker();
|
|
44 |
- unpacker.unpack(f, jostream);
|
|
45 |
- } finally {
|
|
46 |
- jostream.close();
|
|
47 |
- fostream.close();
|
|
48 |
- }
|
|
49 |
-
|
|
50 |
- // delete pack file as its no longer needed
|
|
51 |
- f.delete();
|
|
52 |
- }
|
|
53 |
-
|
|
54 |
- /**
|
|
55 |
* Extract all jars from any lzma/gz/pack files
|
|
56 |
*
|
|
57 |
* @param path output path
|
|
58 |
@@ -1715,30 +1683,7 @@
|
|
59 |
percentage = 55 + (int) (increment * (i+1));
|
|
60 |
String filename = getFileName(urlList[i]);
|
|
61 |
|
|
62 |
- if (filename.endsWith(".pack.lzma")) {
|
|
63 |
- subtaskMessage = "Extracting: " + filename + " to " + replaceLast(filename, ".lzma", "");
|
|
64 |
- debug_sleep(1000);
|
|
65 |
- extractLZMA(path + filename, path + replaceLast(filename, ".lzma", ""));
|
|
66 |
-
|
|
67 |
- subtaskMessage = "Extracting: " + replaceLast(filename, ".lzma", "") + " to " + replaceLast(filename, ".pack.lzma", "");
|
|
68 |
- debug_sleep(1000);
|
|
69 |
- extractPack(path + replaceLast(filename, ".lzma", ""), path + replaceLast(filename, ".pack.lzma", ""));
|
|
70 |
- }
|
|
71 |
- else if (filename.endsWith(".pack.gz")) {
|
|
72 |
- subtaskMessage = "Extracting: " + filename + " to " + replaceLast(filename, ".gz", "");
|
|
73 |
- debug_sleep(1000);
|
|
74 |
- extractGZip(path + filename, path + replaceLast(filename, ".gz", ""));
|
|
75 |
-
|
|
76 |
- subtaskMessage = "Extracting: " + replaceLast(filename, ".gz", "") + " to " + replaceLast(filename, ".pack.gz", "");
|
|
77 |
- debug_sleep(1000);
|
|
78 |
- extractPack(path + replaceLast(filename, ".gz", ""), path + replaceLast(filename, ".pack.gz", ""));
|
|
79 |
- }
|
|
80 |
- else if (filename.endsWith(".pack")) {
|
|
81 |
- subtaskMessage = "Extracting: " + filename + " to " + replaceLast(filename, ".pack", "");
|
|
82 |
- debug_sleep(1000);
|
|
83 |
- extractPack(path + filename, path + replaceLast(filename, ".pack", ""));
|
|
84 |
- }
|
|
85 |
- else if (filename.endsWith(".lzma")) {
|
|
86 |
+ if (filename.endsWith(".lzma")) {
|
|
87 |
subtaskMessage = "Extracting: " + filename + " to " + replaceLast(filename, ".lzma", "");
|
|
88 |
debug_sleep(1000);
|
|
89 |
extractLZMA(path + filename, path + replaceLast(filename, ".lzma", ""));
|