Skip to content

Commit 1a4faf3

Browse files
committed
Disable all standalones and all installables
1 parent 95516c3 commit 1a4faf3

File tree

2 files changed

+7
-34
lines changed

2 files changed

+7
-34
lines changed

sdk/mx.sdk/mx_sdk_vm.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -334,14 +334,10 @@ def __init__(self,
334334
self.priority = priority or 0
335335
self.launcher_configs = launcher_configs or []
336336
self.library_configs = library_configs or []
337-
if installable is None:
338-
installable = isinstance(self, GraalVmLanguage)
339-
self.installable = installable
340-
if standalone is None:
341-
standalone = installable
342-
self.standalone = standalone
343-
self.post_install_msg = post_install_msg
344-
self.installable_id = installable_id or self.dir_name
337+
self.installable = None
338+
self.standalone = None
339+
self.post_install_msg = None
340+
self.installable_id = None
345341
self.extra_installable_qualifiers = extra_installable_qualifiers or []
346342
self.has_relative_home = has_relative_home
347343
self.jvm_configs = jvm_configs or []

sdk/mx.sdk/mx_sdk_vm_impl.py

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3952,12 +3952,6 @@ def _infer_env(graalvm_dist):
39523952
elif isinstance(disableInstallables, bool):
39533953
disableInstallables = [str(disableInstallables)]
39543954

3955-
enableInstallables = _enabled_installables()
3956-
if enableInstallables is None:
3957-
enableInstallables = []
3958-
elif isinstance(enableInstallables, bool):
3959-
enableInstallables = [str(enableInstallables)]
3960-
39613955
non_rebuildable_images = _non_rebuildable_images()
39623956
if isinstance(non_rebuildable_images, bool):
39633957
non_rebuildable_images = [str(non_rebuildable_images)]
@@ -4550,37 +4544,20 @@ def _disabled_installables():
45504544
"""
45514545
:rtype: bool
45524546
"""
4553-
disabled_installables = _parse_cmd_arg('disable_installables')
4554-
assert disabled_installables is None or _parse_cmd_arg('installables') is None, "Cannot set both '--disable-installables'/'$DISABLE_INSTALLABLES' (got '{}') and '--installables'/'$INSTALLABLES' (got: '{}')".format(disabled_installables, _parse_cmd_arg('installables'))
4555-
return disabled_installables
4547+
return True
45564548

45574549

45584550
def _enabled_installables():
45594551
"""
45604552
:rtype: bool
45614553
"""
4562-
enabled_installables = _parse_cmd_arg('installables')
4563-
assert enabled_installables is None or _parse_cmd_arg('disable_installables') is None, "Cannot set both '--installables'/'$INSTALLABLES' (got '{}') and '--disable-installables'/'$DISABLE_INSTALLABLES' (got: '{}')".format(enabled_installables, _parse_cmd_arg('disable_installables'))
4564-
return enabled_installables
4554+
return None
45654555

45664556

45674557
def _disable_installable(component):
45684558
""" :type component: mx_sdk.GraalVmComponent """
45694559
assert isinstance(component, mx_sdk.GraalVmComponent)
4570-
disabled = _disabled_installables()
4571-
if disabled is None:
4572-
enabled = _enabled_installables()
4573-
if enabled is None:
4574-
return not has_vm_suite()
4575-
if isinstance(enabled, bool):
4576-
return not enabled
4577-
else:
4578-
return not any((name in enabled for name in [component.name, component.short_name]))
4579-
else:
4580-
if isinstance(disabled, bool):
4581-
return disabled
4582-
else:
4583-
return any((name in disabled for name in [component.name, component.short_name]))
4560+
return True
45844561

45854562

45864563
def _has_forced_launchers(component):

0 commit comments

Comments
 (0)