Skip to content

Commit 04268c1

Browse files
committed
[GR-65374] Unchained standalone cleanups
* Set language_id for deployment. * Standardize how truffle-runtime.jar is excluded. * Remove unused old-standalone configuration. * Remove unused dynamic import in native-ee env. * Remove extra *.files and *.sha256 files at the root of the standalone.
1 parent 4a25dcd commit 04268c1

File tree

3 files changed

+19
-22
lines changed

3 files changed

+19
-22
lines changed

mx.graalpython/mx_graalpython.py

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ def get_jdk():
245245

246246
# Called from suite.py
247247
def graalpy_standalone_deps():
248-
include_truffle_runtime = not os.environ.get("EXCLUDE_TRUFFLE_RUNTIME")
248+
include_truffle_runtime = not mx.env_var_to_bool("EXCLUDE_TRUFFLE_RUNTIME")
249249
deps = mx_truffle.resolve_truffle_dist_names(use_optimized_runtime=include_truffle_runtime)
250250
return deps
251251

@@ -2004,11 +2004,6 @@ def _python_checkpatchfiles():
20042004
))
20052005

20062006

2007-
standalone_dependencies_common = {
2008-
"Truffle NFI": "truffle:TRUFFLE_NFI",
2009-
"Truffle NFI LIBFFI": "truffle:TRUFFLE_NFI_LIBFFI",
2010-
}
2011-
20122007
def bytecode_dsl_build_args():
20132008
return ['-Dpython.EnableBytecodeDSLInterpreter=true'] if BYTECODE_DSL_INTERPRETER else []
20142009

@@ -2021,10 +2016,7 @@ def bytecode_dsl_build_args():
20212016
suite=SUITE,
20222017
name='GraalVM Python',
20232018
short_name='pyn',
2024-
installable_id='python',
20252019
dir_name='python',
2026-
standalone_dir_name='graalpy-community-<version>-<graalvm_os>-<arch>',
2027-
standalone_dir_name_enterprise='graalpy-<version>-<graalvm_os>-<arch>',
20282020
license_files=[],
20292021
third_party_license_files=[],
20302022
dependencies=[
@@ -2034,13 +2026,6 @@ def bytecode_dsl_build_args():
20342026
'ICU4J',
20352027
'XZ',
20362028
],
2037-
standalone_dependencies={**standalone_dependencies_common, **{
2038-
'GraalVM Python license files': ('', []),
2039-
}},
2040-
standalone_dependencies_enterprise={**standalone_dependencies_common, **{
2041-
'GraalVM Python license files EE': ('', []),
2042-
'GraalVM enterprise license files': ('', ['LICENSE.txt', 'GRAALVM-README.md']),
2043-
}},
20442029
truffle_jars=[
20452030
'graalpython:GRAALPYTHON',
20462031
'graalpython:BOUNCYCASTLE-PROVIDER',

mx.graalpython/native-ee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
DYNAMIC_IMPORTS=/tools,/graal-enterprise,/truffle-enterprise,/vm-enterprise,/substratevm-enterprise,substratevm-enterprise-gcs
1+
DYNAMIC_IMPORTS=/tools,/graal-enterprise,/truffle-enterprise,/vm-enterprise,/substratevm-enterprise
22
BUILD_TARGETS=GRAALPY_NATIVE_STANDALONE
3-
COMPONENTS=SubstrateVM Enterprise,Truffle SVM Macro Enterprise,suite:substratevm-enterprise-gcs
3+
COMPONENTS=SubstrateVM Enterprise,Truffle SVM Macro Enterprise
44
NATIVE_IMAGES=lib:pythonvm
55
GRAALVM_SKIP_ARCHIVE=true

mx.graalpython/suite.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,8 +1356,13 @@
13561356
"dependency:GRAALPYTHON_INCLUDE_RESOURCES/META-INF/resources/include/*",
13571357
],
13581358
"./": [
1359-
"dependency:GRAALPYTHON_NI_RESOURCES/META-INF/resources/*",
1360-
"dependency:GRAALPYTHON_NATIVE_RESOURCES/META-INF/resources/<os>/<arch>/*",
1359+
"dependency:GRAALPYTHON_NI_RESOURCES/META-INF/resources/native-image.properties",
1360+
{
1361+
"source_type": "dependency",
1362+
"dependency": "GRAALPYTHON_NATIVE_RESOURCES",
1363+
"path": "META-INF/resources/<os>/<arch>/*",
1364+
"exclude": ["META-INF/resources/<os>/<arch>/native.sha256", "META-INF/resources/<os>/<arch>/native.files"],
1365+
},
13611366
],
13621367
},
13631368
},
@@ -1375,8 +1380,13 @@
13751380
"dependency:GRAALPYTHON_INCLUDE_RESOURCES/META-INF/resources/include/*",
13761381
],
13771382
"./": [
1378-
"dependency:GRAALPYTHON_NI_RESOURCES/META-INF/resources/*",
1379-
"dependency:GRAALPYTHON_NATIVE_RESOURCES/META-INF/resources/<os>/<arch>/*",
1383+
"dependency:GRAALPYTHON_NI_RESOURCES/META-INF/resources/native-image.properties",
1384+
{
1385+
"source_type": "dependency",
1386+
"dependency": "GRAALPYTHON_NATIVE_RESOURCES",
1387+
"path": "META-INF/resources/<os>/<arch>/*",
1388+
"exclude": ["META-INF/resources/<os>/<arch>/native.sha256", "META-INF/resources/<os>/<arch>/native.files"],
1389+
},
13801390
],
13811391
},
13821392
},
@@ -1506,6 +1516,7 @@
15061516
"standalone_dist": "GRAALPY_NATIVE_STANDALONE",
15071517
"community_archive_name": "graalpy-community",
15081518
"enterprise_archive_name": "graalpy",
1519+
"language_id": "python",
15091520
},
15101521

15111522
"GRAALPY_JVM_STANDALONE_RELEASE_ARCHIVE": {
@@ -1514,6 +1525,7 @@
15141525
"standalone_dist": "GRAALPY_JVM_STANDALONE",
15151526
"community_archive_name": "graalpy-community-jvm",
15161527
"enterprise_archive_name": "graalpy-jvm",
1528+
"language_id": "python",
15171529
},
15181530

15191531
"graalpy-archetype-polyglot-app": {

0 commit comments

Comments
 (0)