admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve progress prints when installing tools and SDKs.

Browse Source
This commit is contained in:
Jukka Jylänki
2015-04-12 17:13:15 +03:00
parent fd67c1fb15
commit 42d7b34bb9
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
emsdk
View File

@@ -934,8 +934,8 @@ class Tool:
print("The tool '" + str(self) + "' is not available due to the reason: " + self.can_be_installed()) print("The tool '" + str(self) + "' is not available due to the reason: " + self.can_be_installed())
return False return False
print("Installing '" + str(self) + "'..")
if self.id == 'sdk': if self.id == 'sdk':
print("Installing SDK '" + str(self) + "'..")
for tool_name in self.uses: for tool_name in self.uses:
tool = find_tool(tool_name) tool = find_tool(tool_name)
if tool == None: if tool == None:
@@ -943,9 +943,10 @@ class Tool:
success = tool.install() success = tool.install()
if not success: if not success:
return False return False
print("Done.") print("Done installing SDK '" + str(self) + "'.")
return True return True
else: else:
print("Installing tool '" + str(self) + "'..")
url = self.download_url() url = self.download_url()
if hasattr(self, 'custom_install_script') and self.custom_install_script == 'build_fastcomp': if hasattr(self, 'custom_install_script') and self.custom_install_script == 'build_fastcomp':
success = build_fastcomp_tool(self) success = build_fastcomp_tool(self)
@@ -966,7 +967,7 @@ class Tool:
if not success: if not success:
print("Installation failed!") print("Installation failed!")
return False return False
print("Done.") print("Done installing tool '" + str(self) + "'.")
# Sanity check that the installation succeeded, and if so, remove unneeded leftover installation files. # Sanity check that the installation succeeded, and if so, remove unneeded leftover installation files.
if self.is_installed(): if self.is_installed():
@@ -998,7 +999,7 @@ class Tool:
os.remove(self.installation_path()) os.remove(self.installation_path())
except: except:
pass pass
print("Done.") print("Done uninstalling '" + str(self) + "'.")
def dependencies(self): def dependencies(self):
if not hasattr(self, 'uses'): if not hasattr(self, 'uses'):