@@ -265,10 +265,14 @@ local devkits = graal_common.devkits;
265
265
polyglot_isolate_distributions(language_ids, current_os, current_arch, current_only=false)::
266
266
std.flattenArrays ([self .language_polyglot_isolate_distributions(id, current_os, current_arch, current_only) for id in language_ids]),
267
267
268
- # To add a polyglot isolate build for a language, ensure that the language is included in the `ee_suites`
269
- # and add the language id to `polyglot_isolate_languages`.
268
+ # To enable polyglot isolate builds for a language:
269
+ # 1. Add the language ID to `polyglot_isolate_languages`.
270
+ # 2. Ensure the language is either:
271
+ # - already included in `ee_suites`, or
272
+ # - its suite is listed in `polyglot_isolate_ce_suites`.
270
273
local polyglot_isolate_languages = ['js' , 'python' ],
271
-
274
+ local polyglot_isolate_ce_suites = ['graal-js' , 'graalpython' ],
275
+ local polyglot_isolate_mx_args = std.flattenArrays ([['--suite' , s] for s in polyglot_isolate_ce_suites]),
272
276
273
277
legacy_mx_args:: [], # `['--force-bash-launcher=true', '--skip-libraries=true']` have been replaced by arguments from `vm.maven_deploy_base_functions.mx_args(os, arch)`
274
278
mx_args(os, arch, reduced):: self .legacy_mx_args + vm.maven_deploy_base_functions.mx_args(os, arch, reduced),
@@ -327,8 +331,8 @@ local devkits = graal_common.devkits;
327
331
if (vm.maven_deploy_base_functions.edition == 'ce' ) then
328
332
self .deploy_ce(os, arch, false , dry_run, [remote_mvn_repo])
329
333
else
330
- self .deploy_ee(os, arch, false , dry_run, ['--dummy-javadoc' , '--skip' , std.join (',' , self .polyglot_isolate_distributions(polyglot_isolate_languages, os, arch)) + ',TOOLS_COMMUNITY,LANGUAGES_COMMUNITY' , remote_mvn_repo])
331
- + self .deploy_ee(os, arch, false , dry_run, ['--dummy-javadoc' , '--only' , std.join (',' , self .polyglot_isolate_distributions(polyglot_isolate_languages, os, arch, true )) + ',TOOLS_COMMUNITY,LANGUAGES_COMMUNITY' , remote_mvn_repo], extra_mx_args=[ '--suite' , 'graal-js' ] );
334
+ self .deploy_ee(os, arch, false , dry_run, ['--dummy-javadoc' , '--skip' , std.join (',' , self .polyglot_isolate_distributions(polyglot_isolate_languages, os, arch)) + ',TOOLS,LANGUAGES, TOOLS_COMMUNITY,LANGUAGES_COMMUNITY' , remote_mvn_repo])
335
+ + self .deploy_ee(os, arch, false , dry_run, ['--dummy-javadoc' , '--only' , std.join (',' , self .polyglot_isolate_distributions(polyglot_isolate_languages, os, arch, true )) + ',TOOLS,LANGUAGES, TOOLS_COMMUNITY,LANGUAGES_COMMUNITY' , remote_mvn_repo], extra_mx_args=polyglot_isolate_mx_args );
332
336
333
337
local mvn_bundle_snippet =
334
338
[
@@ -342,8 +346,8 @@ local devkits = graal_common.devkits;
342
346
if (vm.maven_deploy_base_functions.edition == 'ce' ) then
343
347
self .deploy_ce(os, arch, false , dry_run, [local_repo, '${LOCAL_MAVEN_REPO_URL}' ])
344
348
else
345
- self .deploy_ce(os, arch, false , dry_run, ['--dummy-javadoc' , '--skip' , std.join (',' , self .polyglot_isolate_distributions(polyglot_isolate_languages, os, arch)) + ',TOOLS_COMMUNITY,LANGUAGES_COMMUNITY' , local_repo, '${LOCAL_MAVEN_REPO_URL}' ])
346
- + self .deploy_ee(os, arch, false , dry_run, ['--dummy-javadoc' , '--only' , std.join (',' , self .polyglot_isolate_distributions(polyglot_isolate_languages, os, arch)) + ',TOOLS_COMMUNITY,LANGUAGES_COMMUNITY' , local_repo, '${LOCAL_MAVEN_REPO_URL}' ], extra_mx_args=[ '--suite' , 'graal-js' ] )
349
+ self .deploy_ce(os, arch, false , dry_run, ['--dummy-javadoc' , '--skip' , std.join (',' , self .polyglot_isolate_distributions(polyglot_isolate_languages, os, arch)) + ',TOOLS,LANGUAGES, TOOLS_COMMUNITY,LANGUAGES_COMMUNITY' , local_repo, '${LOCAL_MAVEN_REPO_URL}' ])
350
+ + self .deploy_ee(os, arch, false , dry_run, ['--dummy-javadoc' , '--only' , std.join (',' , self .polyglot_isolate_distributions(polyglot_isolate_languages, os, arch)) + ',TOOLS,LANGUAGES, TOOLS_COMMUNITY,LANGUAGES_COMMUNITY' , local_repo, '${LOCAL_MAVEN_REPO_URL}' ], extra_mx_args=polyglot_isolate_mx_args )
347
351
+ self .deploy_ee(os, arch, false , dry_run, ['--dummy-javadoc' , local_repo, '${LOCAL_MAVEN_REPO_URL}' ])
348
352
)
349
353
+ (
@@ -374,7 +378,7 @@ local devkits = graal_common.devkits;
374
378
+ (
375
379
# Locally deploy all relevant suites
376
380
self .deploy_ce(os, arch, true , dry_run, ['--dummy-javadoc' , '--only' , vm.maven_deploy_base_functions.reduced_ce_dists, local_repo, '${LOCAL_MAVEN_REDUCED_REPO_URL}' ])
377
- + self .deploy_ee(os, arch, true , dry_run, ['--dummy-javadoc' , '--only' , vm.maven_deploy_base_functions.reduced_ee_dists, local_repo, '${LOCAL_MAVEN_REDUCED_REPO_URL}' ], extra_mx_args=[ '--suite' , 'graal-js' ] )
381
+ + self .deploy_ee(os, arch, true , dry_run, ['--dummy-javadoc' , '--only' , vm.maven_deploy_base_functions.reduced_ee_dists, local_repo, '${LOCAL_MAVEN_REDUCED_REPO_URL}' ], extra_mx_args=polyglot_isolate_mx_args )
378
382
)
379
383
+ (
380
384
# Archive and deploy
@@ -425,7 +429,7 @@ local devkits = graal_common.devkits;
425
429
else
426
430
self .build(os, arch, reduced=false , build_args=['--targets=' + self .only_native_dists + ',' + std.join (',' , self .polyglot_isolate_distributions(polyglot_isolate_languages, os, arch, true )) + ',{PLATFORM_DEPENDENT_LAYOUT_DIR_DISTRIBUTIONS}' ]) +
427
431
[['echo' , 'Skipping the deployment of ' + self .only_native_dists + ': It is already deployed by the ce job' ]] +
428
- self .deploy_ee(os, arch, false , dry_run, ['--dummy-javadoc' , '--only' , std.join (',' , self .polyglot_isolate_distributions(polyglot_isolate_languages, os, arch, true )), remote_mvn_repo], extra_mx_args=[ '--suite' , 'graal-js' ] )
432
+ self .deploy_ee(os, arch, false , dry_run, ['--dummy-javadoc' , '--only' , std.join (',' , self .polyglot_isolate_distributions(polyglot_isolate_languages, os, arch, true )), remote_mvn_repo], extra_mx_args=polyglot_isolate_mx_args )
429
433
)
430
434
+ [self .mx_cmd_base(os, arch, reduced=false ) + ['archive-pd-layouts' , self .pd_layouts_archive_name(os + '-' + arch)]]
431
435
),
0 commit comments