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

Remove special version check for vs-tool. NFC. (#740)

Browse Source 
As of #505 all tools write a check a version file so we don't need to
special case vs-tool anymore.
This commit is contained in:
Sam Clegg
2021-03-08 08:02:38 -08:00
committed by GitHub
parent 7cba2e0a92
commit f0ee795014
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
emsdk.py
View File

@@ -1551,13 +1551,6 @@ def find_msbuild_dir():
return '' return ''
def get_installed_vstool_version(installed_path):
try:
return open(installed_path + "/version.txt", "r").read()
except:
return None
class Tool(object): class Tool(object):
def __init__(self, data): def __init__(self, data):
# Convert the dictionary representation of the tool in 'data' to members of # Convert the dictionary representation of the tool in 'data' to members of
@@ -1695,12 +1688,12 @@ class Tool(object):
version_file_path = self.get_version_file_path() version_file_path = self.get_version_file_path()
if os.path.isfile(version_file_path): if os.path.isfile(version_file_path):
with open(version_file_path, 'r') as version_file: with open(version_file_path, 'r') as version_file:
return version_file.read() == self.name return version_file.read().strip() == self.name
return False return False
def update_installed_version(self): def update_installed_version(self):
with open(self.get_version_file_path(), 'w') as version_file: with open(self.get_version_file_path(), 'w') as version_file:
version_file.write(self.name) version_file.write(self.name + '\n')
return None return None
def is_installed(self, skip_version_check=False): def is_installed(self, skip_version_check=False):
@@ -1731,11 +1724,6 @@ class Tool(object):
if hasattr(self, 'activated_path') and not os.path.exists(self.expand_vars(self.activated_path)): if hasattr(self, 'activated_path') and not os.path.exists(self.expand_vars(self.activated_path)):
content_exists = False content_exists = False
# vs-tool is a special tool since all versions must be installed to the
# same dir, so dir name will not differentiate the version.
if self.id == 'vs-tool':
return content_exists and get_installed_vstool_version(self.installation_path()) == self.version
if hasattr(self, 'custom_is_installed_script'): if hasattr(self, 'custom_is_installed_script'):
if self.custom_is_installed_script == 'is_optimizer_installed': if self.custom_is_installed_script == 'is_optimizer_installed':
return is_optimizer_installed(self) return is_optimizer_installed(self)