Skip to content

Rename "uses" tool property to "deps". NFC #1772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbc100 merged 1 commit into from
Aug 5, 2026
Merged

Rename "uses" tool property to "deps". NFC #1772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions emsdk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1838,7 +1838,7 @@ class Tool:
url = None

def __init__(self, data):
self.uses = []
self.deps = []

# Convert the dictionary representation of the tool in 'data' to members of
# this class. Base attributes are assigned first, then host OS-matching suffixed
Expand Down Expand Up @@ -1901,10 +1901,10 @@ def needs_compilation(self):
if self.cmake_build_type:
return True

for tool_name in self.uses:
tool = find_tool(tool_name)
for dep in self.deps:
tool = find_tool(dep)
if not tool:
debug_print(f'Tool {self} depends on {tool_name} which does not exist!')
debug_print(f'Tool {self} depends on {dep} which does not exist!')
continue
if tool.needs_compilation():
return True
Expand Down Expand Up @@ -1985,10 +1985,10 @@ def update_installed_version(self):
def is_installed(self, skip_version_check=False):
# If this tool/sdk depends on other tools, require that all dependencies are
# installed for this tool to count as being installed.
for tool_name in self.uses:
tool = find_tool(tool_name)
for dep in self.deps:
tool = find_tool(dep)
if tool is None:
errlog(f"Manifest error: No tool by name '{tool_name}' found! This may indicate an internal SDK error!")
errlog(f"Manifest error: No tool by name '{dep}' found! This may indicate an internal SDK error!")
return False
if not tool.is_installed():
return False
Expand Down Expand Up @@ -2094,10 +2094,10 @@ def install_sdk(self):
print(f"Installing SDK '{self}'..")
installed = False

for tool_name in self.uses:
tool = find_tool(tool_name)
for dep in self.deps:
tool = find_tool(dep)
if tool is None:
exit_with_error(f"manifest error: No tool by name '{tool_name}' found! This may indicate an internal SDK error!")
exit_with_error(f"manifest error: No tool by name '{dep}' found! This may indicate an internal SDK error!")
installed |= tool.install()

if not installed:
Expand Down Expand Up @@ -2205,16 +2205,16 @@ def uninstall(self):
def dependencies(self):
deps = []

for tool_name in self.uses:
tool = find_tool(tool_name)
for dep in self.deps:
tool = find_tool(dep)
if tool:
deps += [tool]
return deps

def recursive_dependencies(self):
deps = []
for tool_name in self.uses:
tool = find_tool(tool_name)
for dep in self.deps:
tool = find_tool(dep)
if tool:
deps += [tool]
deps += tool.recursive_dependencies()
Expand Down Expand Up @@ -2471,10 +2471,10 @@ def load_sdk_manifest():
releases_tags = load_releases_tags()

def dependencies_exist(sdk):
for tool_name in sdk.uses:
tool = find_tool(tool_name)
for dep in sdk.deps:
tool = find_tool(dep)
if not tool:
debug_print('missing dependency: ' + tool_name)
debug_print('missing dependency: ' + dep)
return False
return True

Expand Down Expand Up @@ -2515,7 +2515,7 @@ def expand_category_param(param, category_list, t, is_sdk):
if not found_param:
continue
t2.is_old = i < len(category_list) - 2
t2.uses = [x.replace(param, ver) for x in t2.uses]
t2.deps = [x.replace(param, ver) for x in t2.deps]

if is_sdk:
if dependencies_exist(t2):
Expand Down Expand Up @@ -2912,10 +2912,10 @@ def main(args): # ruff: ignore[complex-structure, too-many-return-statements, t
print(' emsdk: Available commands:')

print('''
emsdk list [--old] [--uses] - Lists all available SDKs and tools and their
emsdk list [--old] [--deps] - Lists all available SDKs and tools and their
current installation status. With the --old
parameter, also historical versions are
shown. If --uses is passed, displays the
shown. If --deps is passed, displays the
composition of different SDK packages and
dependencies.

Expand Down Expand Up @@ -3051,7 +3051,7 @@ def extract_string_arg(name):
return value

arg_old = extract_bool_arg('--old')
arg_uses = extract_bool_arg('--uses')
arg_deps = extract_bool_arg('--deps')
arg_permanent = extract_bool_arg('--permanent')
arg_global = extract_bool_arg('--global')
arg_system = extract_bool_arg('--system')
Expand Down Expand Up @@ -3169,8 +3169,8 @@ def print_sdks(s):
installed = '\tINSTALLED' if sdk.is_installed() else ''
active = '*' if sdk.is_active() else ' '
print(' ' + active + ' {0: <25}'.format(str(sdk)) + installed)
if arg_uses:
for dep in sdk.uses:
if arg_deps:
for dep in sdk.deps:
print(' - {0: <25}'.format(dep))
print('')
print('The additional following precompiled SDKs are also available for download:')
Expand Down
16 changes: 8 additions & 8 deletions emsdk_manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,54 +679,54 @@
{
"version": "main",
"bitness": 64,
"uses": ["python-3.13.3-64bit", "llvm-git-main-64bit", "node-24.19.0-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
"deps": ["python-3.13.3-64bit", "llvm-git-main-64bit", "node-24.19.0-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
"os": "windows"
},
{
"version": "main",
"bitness": 64,
"uses": ["python-3.13.3-64bit", "llvm-git-main-64bit", "node-24.19.0-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
"deps": ["python-3.13.3-64bit", "llvm-git-main-64bit", "node-24.19.0-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
"os": "macos"
},
{
"version": "main",
"bitness": 64,
"uses": ["llvm-git-main-64bit", "node-24.19.0-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
"deps": ["llvm-git-main-64bit", "node-24.19.0-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
"os": "linux"
},
{
"version": "main",
"bitness": 32,
"uses": ["llvm-git-main-32bit", "emscripten-main-32bit", "binaryen-main-32bit"],
"deps": ["llvm-git-main-32bit", "emscripten-main-32bit", "binaryen-main-32bit"],
"os": "linux"
},
{
"version": "releases-%releases-tag%",
"bitness": 64,
"uses": ["node-24.19.0-64bit", "releases-%releases-tag%-64bit"],
"deps": ["node-24.19.0-64bit", "releases-%releases-tag%-64bit"],
"os": "linux",
"custom_install_script": "sdk_post_install"
},
{
"version": "releases-%releases-tag%",
"bitness": 64,
"uses": ["node-24.19.0-64bit", "python-3.13.3-64bit", "releases-%releases-tag%-64bit"],
"deps": ["node-24.19.0-64bit", "python-3.13.3-64bit", "releases-%releases-tag%-64bit"],
"os": "macos",
"arch": "x86_64",
"custom_install_script": "sdk_post_install"
},
{
"version": "releases-%releases-tag%",
"bitness": 64,
"uses": ["node-24.19.0-64bit", "python-3.13.3-64bit", "releases-%releases-tag%-64bit"],
"deps": ["node-24.19.0-64bit", "python-3.13.3-64bit", "releases-%releases-tag%-64bit"],
"os": "macos",
"arch": "arm64",
"custom_install_script": "sdk_post_install"
},
{
"version": "releases-%releases-tag%",
"bitness": 64,
"uses": ["node-24.19.0-64bit", "python-3.13.3-64bit", "releases-%releases-tag%-64bit"],
"deps": ["node-24.19.0-64bit", "python-3.13.3-64bit", "releases-%releases-tag%-64bit"],
"os": "windows",
"custom_install_script": "sdk_post_install"
}
Expand Down