Skip to content

Commit 3a05987

Browse files
[GR-46398] Add module name for espresso.
PullRequest: graal/15155
2 parents f992b55 + 339b95b commit 3a05987

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

espresso/mx.espresso/suite.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -313,23 +313,22 @@
313313

314314
"distributions": {
315315
"ESPRESSO": {
316+
"moduleInfo" : {
317+
"name" : "org.graalvm.espresso",
318+
},
319+
"description" : "Java on Truffle (aka Espresso): a Java bytecode interpreter",
316320
"subDir": "src",
317321
"dependencies": [
318322
"com.oracle.truffle.espresso",
319323
],
320324
"distDependencies": [
321325
"truffle:TRUFFLE_API",
322326
"truffle:TRUFFLE_NFI",
323-
"truffle:TRUFFLE_NFI_LIBFFI",
324-
"tools:TRUFFLE_PROFILER",
325-
],
326-
"exclude": [
327-
"truffle:TRUFFLE_ASM_9.5",
328327
],
329328
"javaProperties": {
330329
"org.graalvm.language.java.home": "<path:ESPRESSO_SUPPORT>",
331330
},
332-
"maven": False,
331+
"noMavenJavadoc": True,
333332
},
334333

335334
"ESPRESSO_LAUNCHER": {

sdk/mx.sdk/suite.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"lafo-maven" : {
7171
"snapshotsUrl" : "https://curio.ssw.jku.at/nexus/content/repositories/maven-snapshots",
7272
"releasesUrl": "https://curio.ssw.jku.at/nexus/content/repositories/maven-releases",
73-
"licenses" : ["GPLv2-CPE", "UPL", "BSD-new", "MIT", "NCSA", "ICU"],
73+
"licenses" : ["GPLv2-CPE", "GPLv2", "UPL", "BSD-new", "MIT", "NCSA", "ICU"],
7474
"mavenId" : "lafo",
7575
},
7676
},
@@ -430,6 +430,10 @@
430430
"name" : "Unicode/ICU License",
431431
"url" : "https://raw.githubusercontent.com/unicode-org/icu/main/LICENSE",
432432
},
433+
"GPLv2" : {
434+
"name" : "GNU General Public License, version 2",
435+
"url" : "http://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
436+
},
433437
},
434438

435439
# ------------- Distributions -------------

vm/ci/ci_includes/vm.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
5151
},
5252
mx_cmd_base:: ['mx', '--dynamicimports', '/tools,/compiler,/graal-js,/espresso,/substratevm', '--disable-installables=true', '--force-bash-launcher=true', '--skip-libraries=true'],
5353
build:: self.mx_cmd_base + ['build'],
54-
deploy(repo, dry_run=false):: self.mx_cmd_base + ['--suite', 'compiler', '--suite', 'truffle', '--suite', 'sdk', '--suite', 'tools', '--suite', 'regex', '--suite', 'graal-js', '--suite', 'espresso', '--suite', 'substratevm', 'maven-deploy', '--tags=default', '--all-distribution-types', '--validate', 'full', '--licenses', 'GPLv2-CPE,UPL,MIT,ICU'] +
54+
deploy(repo, dry_run=false):: self.mx_cmd_base + ['--suite', 'compiler', '--suite', 'truffle', '--suite', 'sdk', '--suite', 'tools', '--suite', 'regex', '--suite', 'graal-js', '--suite', 'espresso', '--suite', 'substratevm', 'maven-deploy', '--tags=default', '--all-distribution-types', '--validate', 'full', '--licenses', 'GPLv2-CPE,GPLv2,UPL,MIT,ICU'] +
5555
(if dry_run then ['--dry-run'] else []) +
5656
(if repo == null then [] else [repo]),
5757
},

0 commit comments

Comments
 (0)