Skip to content

Commit 668fa41

Browse files
committed
Migrate Python language dists to modules
1 parent 57e92ef commit 668fa41

File tree

1 file changed

+44
-11
lines changed

1 file changed

+44
-11
lines changed

mx.graalpython/suite.py

Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@
114114
"artifactId": "xz",
115115
"version": "1.8",
116116
},
117+
"moduleName": "org.tukaani.xz",
117118
},
118119
"XZ-5.2.6": {
119120
"urls": [
@@ -130,6 +131,7 @@
130131
"artifactId": "bcprov-jdk15on",
131132
"version": "1.68",
132133
},
134+
"moduleName": "org.bouncycastle.provider",
133135
},
134136
"BOUNCYCASTLE-PKIX": {
135137
"sha1": "81da950604ff0b2652348cbd2b48fde46ced9867",
@@ -139,6 +141,7 @@
139141
"artifactId": "bcpkix-jdk15on",
140142
"version": "1.68",
141143
},
144+
"moduleName": "org.bouncycastle.pkix",
142145
},
143146
"BZIP2": {
144147
"urls": [
@@ -765,6 +768,13 @@
765768
# --------------------------------------------------------------------------------------------------------------
766769
"distributions": {
767770
"GRAALPYTHON-LAUNCHER": {
771+
"moduleInfo" : {
772+
"name" : "org.graalvm.py.launcher",
773+
"exports" : [
774+
# How does the enterprise launcher work without this (O.o)?
775+
# "com.oracle.graal.python.shell to com.oracle.graal.python.enterprise.shell"
776+
],
777+
},
768778
"dependencies": [
769779
"com.oracle.graal.python.shell",
770780
],
@@ -835,18 +845,33 @@
835845
"maven": True,
836846
},
837847

838-
"GRAALPYTHON_PEGPARSER": {
839-
"dependencies": [
840-
"com.oracle.graal.python.pegparser",
841-
],
842-
"exclude": [
843-
"truffle:ICU4J",
844-
],
845-
"description": "GraalPython PEG parser",
846-
"internal": True,
847-
},
848-
849848
"GRAALPYTHON": {
849+
"moduleInfo" : {
850+
"name" : "org.graalvm.py",
851+
"requiresConcealed" : {
852+
"org.graalvm.truffle" : [
853+
"com.oracle.truffle.api"
854+
],
855+
},
856+
"exports" : [
857+
"com.oracle.graal.python.builtins to org.graalvm.py.enterprise",
858+
"com.oracle.graal.python.builtins.objects.buffer to org.graalvm.py.enterprise",
859+
"com.oracle.graal.python.builtins.objects.bytes to org.graalvm.py.enterprise",
860+
"com.oracle.graal.python.builtins.objects.floats to org.graalvm.py.enterprise",
861+
"com.oracle.graal.python.builtins.objects.function to org.graalvm.py.enterprise",
862+
"com.oracle.graal.python.builtins.objects.ints to org.graalvm.py.enterprise",
863+
"com.oracle.graal.python.builtins.objects.object to org.graalvm.py.enterprise",
864+
"com.oracle.graal.python.lib to org.graalvm.py.enterprise",
865+
"com.oracle.graal.python.nodes to org.graalvm.py.enterprise",
866+
"com.oracle.graal.python.nodes.function to org.graalvm.py.enterprise",
867+
"com.oracle.graal.python.nodes.function.builtins to org.graalvm.py.enterprise",
868+
"com.oracle.graal.python.runtime.exception to org.graalvm.py.enterprise",
869+
"com.oracle.graal.python.util to org.graalvm.py.enterprise",
870+
],
871+
"provides": {
872+
"TruffleLanguageProvider": ["PythonLanguageProvider"],
873+
},
874+
},
850875
"dependencies": [
851876
"com.oracle.graal.python",
852877
"com.oracle.graal.python.frozen",
@@ -862,6 +887,14 @@
862887
"sulong:SULONG_API",
863888
"sulong:SULONG_NATIVE", # this is actually just a runtime dependency
864889
],
890+
"requires": [
891+
"java.base",
892+
"java.logging",
893+
"java.management",
894+
"jdk.management",
895+
"jdk.unsupported",
896+
"jdk.security.auth",
897+
],
865898
"exclude": [
866899
"BOUNCYCASTLE-PROVIDER",
867900
"BOUNCYCASTLE-PKIX",

0 commit comments

Comments
 (0)