Skip to content

Commit af47b67

Browse files
timfeltimfel
committed
shadow XZ for graalpy on module path
1 parent 05a0b5f commit af47b67

File tree

5 files changed

+97
-30
lines changed

5 files changed

+97
-30
lines changed

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/lzma/LZMAModuleBuiltins.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@
7575

7676
import java.util.List;
7777

78-
import org.tukaani.xz.FilterOptions;
79-
import org.tukaani.xz.LZMA2Options;
80-
import org.tukaani.xz.XZ;
81-
import org.tukaani.xz.XZOutputStream;
78+
import org.graalvm.shadowed.org.tukaani.xz.FilterOptions;
79+
import org.graalvm.shadowed.org.tukaani.xz.LZMA2Options;
80+
import org.graalvm.shadowed.org.tukaani.xz.XZ;
81+
import org.graalvm.shadowed.org.tukaani.xz.XZOutputStream;
8282

8383
import com.oracle.graal.python.builtins.Builtin;
8484
import com.oracle.graal.python.builtins.CoreFunctions;

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/lzma/LZMANodes.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,20 @@
7878
import java.io.IOException;
7979
import java.util.Arrays;
8080

81-
import org.tukaani.xz.ARMOptions;
82-
import org.tukaani.xz.ARMThumbOptions;
83-
import org.tukaani.xz.CorruptedInputException;
84-
import org.tukaani.xz.DeltaOptions;
85-
import org.tukaani.xz.FilterOptions;
86-
import org.tukaani.xz.IA64Options;
87-
import org.tukaani.xz.LZMA2Options;
88-
import org.tukaani.xz.MemoryLimitException;
89-
import org.tukaani.xz.PowerPCOptions;
90-
import org.tukaani.xz.SPARCOptions;
91-
import org.tukaani.xz.UnsupportedOptionsException;
92-
import org.tukaani.xz.X86Options;
93-
import org.tukaani.xz.XZFormatException;
94-
import org.tukaani.xz.check.Check;
81+
import org.graalvm.shadowed.org.tukaani.xz.ARMOptions;
82+
import org.graalvm.shadowed.org.tukaani.xz.ARMThumbOptions;
83+
import org.graalvm.shadowed.org.tukaani.xz.CorruptedInputException;
84+
import org.graalvm.shadowed.org.tukaani.xz.DeltaOptions;
85+
import org.graalvm.shadowed.org.tukaani.xz.FilterOptions;
86+
import org.graalvm.shadowed.org.tukaani.xz.IA64Options;
87+
import org.graalvm.shadowed.org.tukaani.xz.LZMA2Options;
88+
import org.graalvm.shadowed.org.tukaani.xz.MemoryLimitException;
89+
import org.graalvm.shadowed.org.tukaani.xz.PowerPCOptions;
90+
import org.graalvm.shadowed.org.tukaani.xz.SPARCOptions;
91+
import org.graalvm.shadowed.org.tukaani.xz.UnsupportedOptionsException;
92+
import org.graalvm.shadowed.org.tukaani.xz.X86Options;
93+
import org.graalvm.shadowed.org.tukaani.xz.XZFormatException;
94+
import org.graalvm.shadowed.org.tukaani.xz.check.Check;
9595

9696
import com.oracle.graal.python.builtins.modules.lzma.LZMAObject.LZMACompressor;
9797
import com.oracle.graal.python.builtins.modules.lzma.LZMAObject.LZMADecompressor;

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/lzma/LZMAObject.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@
5252
import java.io.InputStream;
5353
import java.util.Arrays;
5454

55-
import org.tukaani.xz.FilterOptions;
56-
import org.tukaani.xz.FinishableOutputStream;
57-
import org.tukaani.xz.LZMA2Options;
58-
import org.tukaani.xz.LZMAInputStream;
59-
import org.tukaani.xz.LZMAOutputStream;
60-
import org.tukaani.xz.XZInputStream;
61-
import org.tukaani.xz.XZOutputStream;
62-
import org.tukaani.xz.common.DecoderUtil;
55+
import org.graalvm.shadowed.org.tukaani.xz.FilterOptions;
56+
import org.graalvm.shadowed.org.tukaani.xz.FinishableOutputStream;
57+
import org.graalvm.shadowed.org.tukaani.xz.LZMA2Options;
58+
import org.graalvm.shadowed.org.tukaani.xz.LZMAInputStream;
59+
import org.graalvm.shadowed.org.tukaani.xz.LZMAOutputStream;
60+
import org.graalvm.shadowed.org.tukaani.xz.XZInputStream;
61+
import org.graalvm.shadowed.org.tukaani.xz.XZOutputStream;
62+
import org.graalvm.shadowed.org.tukaani.xz.common.DecoderUtil;
6363

6464
import com.oracle.graal.python.builtins.objects.ints.PInt;
6565
import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;

‎mx.graalpython/mx_graalpython.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@
5858
import mx_graalpython_import
5959
import mx_graalpython_python_benchmarks
6060

61+
from mx_truffle import ShadedLibraryProject
62+
6163
# re-export custom mx project classes so they can be used from suite.py
6264
from mx_cmake import CMakeNinjaProject #pylint: disable=unused-import
6365

@@ -2186,7 +2188,7 @@ def verify_ci(dest_suite, common_ci_dir="ci_common", args=None, ext=('.jsonnet',
21862188
'graalpython:GRAALPYTHON',
21872189
'graalpython:BOUNCYCASTLE-PROVIDER',
21882190
'graalpython:BOUNCYCASTLE-PKIX',
2189-
'graalpython:XZ-1.8',
2191+
'graalpython:TRUFFLE_XZ',
21902192
],
21912193
support_distributions=[
21922194
'graalpython:GRAALPYTHON_GRAALVM_SUPPORT',

‎mx.graalpython/suite.py

Lines changed: 68 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,9 @@
107107
],
108108
"sha1": "7a5960b8062ddbf0c0e79f806e23785d55fec3c8",
109109
},
110-
"XZ-1.8": {
110+
"XZ-1.9": {
111111
"digest": "sha512:a4362db234d4e83683e90f5baf90c82107450cc4404acab96e3fab14b8a3d4588a19722171d32f27d18463682a6994cad9af0b1065c954e3a77ea7bdcf586bac",
112+
"sourceDigest": "sha512:5625f7392d1958466507f0530585c2c40c5b301981ab64115f489dc4599e3364acd7f00bfdc69aa3124d4641a562923dc3ee038faee5a52dd3cbe29a1a35e5ab",
112113
"maven": {
113114
"groupId": "org.tukaani",
114115
"artifactId": "xz",
@@ -255,6 +256,38 @@
255256
},
256257

257258
"projects": {
259+
"org.graalvm.shadowed.org.tukaani.xz" : {
260+
# shaded XZ
261+
"subDir" : "src",
262+
"sourceDirs" : ["src"],
263+
"javaCompliance" : "17+",
264+
"spotbugs" : "false",
265+
"requires" : [
266+
],
267+
"dependencies" : [
268+
],
269+
"shadedDependencies" : [
270+
"graalpython:XZ-1.9",
271+
],
272+
"class" : "ShadedLibraryProject",
273+
"shade" : {
274+
"packages" : {
275+
"org.tukaani.xz" : "org.graalvm.shadowed.org.tukaani.xz",
276+
},
277+
"include" : [
278+
],
279+
"exclude" : [
280+
"META-INF/**",
281+
],
282+
"patch" : {
283+
},
284+
},
285+
"description" : "XZ shaded library.",
286+
"allowsJavadocWarnings": True,
287+
"javac.lint.overrides" : 'none',
288+
"jacoco" : "exclude",
289+
},
290+
258291
"com.oracle.graal.python.pegparser": {
259292
"subDir": "graalpython",
260293
"sourceDirs": ["src"],
@@ -387,7 +420,7 @@
387420
"tools:TRUFFLE_PROFILER",
388421
"sdk:GRAAL_SDK",
389422
"sulong:SULONG_API",
390-
"XZ-1.8",
423+
"graalpython:TRUFFLE_XZ",
391424
"truffle:TRUFFLE_ICU4J",
392425
"regex:TREGEX",
393426
"BOUNCYCASTLE-PROVIDER",
@@ -790,6 +823,38 @@
790823
#
791824
# --------------------------------------------------------------------------------------------------------------
792825
"distributions": {
826+
"TRUFFLE_XZ" : {
827+
# shaded XZ
828+
"moduleInfo" : {
829+
"name" : "org.graalvm.shadowed.org.tukaani.xz",
830+
"requires" : [
831+
],
832+
"exports" : [
833+
"org.graalvm.shadowed.org.tukaani.xz to org.graalvm.py",
834+
"org.graalvm.shadowed.org.tukaani.xz.check to org.graalvm.py",
835+
"org.graalvm.shadowed.org.tukaani.xz.common to org.graalvm.py",
836+
],
837+
},
838+
"subDir" : "src",
839+
"sourceDirs" : ["src"],
840+
"javaCompliance" : "17+",
841+
"spotbugs" : "false",
842+
"dependencies" : [
843+
"org.graalvm.shadowed.org.tukaani.xz",
844+
],
845+
"distDependencies" : [
846+
],
847+
"exclude" : [
848+
],
849+
"description" : "XZ shaded module.",
850+
"allowsJavadocWarnings" : True,
851+
# "license" : ["Public"],
852+
"maven" : {
853+
"groupId" : "org.graalvm.shadowed",
854+
"artifactId" : "xz",
855+
},
856+
},
857+
793858
"GRAALPYTHON-LAUNCHER": {
794859
"moduleInfo": {
795860
"name": "org.graalvm.py.launcher",
@@ -921,6 +986,7 @@
921986
"sdk:GRAAL_SDK",
922987
"sulong:SULONG_API",
923988
"sulong:SULONG_NATIVE", # this is actually just a runtime dependency
989+
"graalpython:TRUFFLE_XZ",
924990
"truffle:TRUFFLE_ICU4J",
925991
"GRAALPYTHON_RESOURCES", # overridden below to make this an optional dependency
926992
],
@@ -935,7 +1001,6 @@
9351001
"exclude": [
9361002
"BOUNCYCASTLE-PROVIDER",
9371003
"BOUNCYCASTLE-PKIX",
938-
"XZ-1.8",
9391004
],
9401005
"javaProperties": {
9411006
"python.jni.library": "<lib:pythonjni>"

0 commit comments

Comments
 (0)