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

Add metasdks 'sdk-nightly-latest', 'sdk-nightly-latest-32bit' and 'sdk-nightly-latest-64bit' which install the most recent available Nightly SDK.

Browse Source
This commit is contained in:
Jukka Jylänki
2016-11-13 03:33:33 +03:00
parent 87cb951ec7
commit 0be8985c6e
1 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
emsdk
View File

@@ -1325,12 +1325,14 @@ def is_os_64bit(): # http://stackoverflow.com/questions/2208828/detect-64bit-os-
def find_latest_32bit_sdk(): def find_latest_32bit_sdk():
for sdk in reversed(sdks): # Newest SDK is always at the end of the list. for sdk in reversed(sdks): # Newest SDK is always at the end of the list.
if not hasattr(sdk, 'bitness') or sdk.bitness == 32: # If no 'bitness' field, it means the SDK is universal. if not hasattr(sdk, 'bitness') or sdk.bitness == 32: # If no 'bitness' field, it means the SDK is universal.
if not 'nightly' in sdk.version:
return sdk return sdk
return None return None
def find_latest_64bit_sdk(): def find_latest_64bit_sdk():
for sdk in reversed(sdks): # Newest SDK is always at the end of the list. for sdk in reversed(sdks): # Newest SDK is always at the end of the list.
if not hasattr(sdk, 'bitness') or sdk.bitness == 64: # If no 'bitness' field, it means the SDK is universal. if not hasattr(sdk, 'bitness') or sdk.bitness == 64: # If no 'bitness' field, it means the SDK is universal.
if not 'nightly' in sdk.version:
return sdk return sdk
return None return None
@@ -1340,6 +1342,26 @@ def find_latest_sdk():
else: else:
return find_latest_32bit_sdk() return find_latest_32bit_sdk()
def find_latest_nightly_32bit_sdk():
for sdk in reversed(sdks): # Newest SDK is always at the end of the list.
if not hasattr(sdk, 'bitness') or sdk.bitness == 32: # If no 'bitness' field, it means the SDK is universal.
if 'nightly' in sdk.version:
return sdk
return None
def find_latest_nightly_64bit_sdk():
for sdk in reversed(sdks): # Newest SDK is always at the end of the list.
if not hasattr(sdk, 'bitness') or sdk.bitness == 64: # If no 'bitness' field, it means the SDK is universal.
if 'nightly' in sdk.version:
return sdk
return None
def find_latest_nightly_sdk():
if is_os_64bit():
return find_latest_nightly_64bit_sdk()
else:
return find_latest_nightly_32bit_sdk()
# Finds the best-matching python tool for use. # Finds the best-matching python tool for use.
def find_used_python(): def find_used_python():
for t in reversed(tools): # Find newest tool first - those are always at the end of the list. for t in reversed(tools): # Find newest tool first - those are always at the end of the list.
@@ -1865,6 +1887,12 @@ def main():
sys.argv[i] = str(find_latest_32bit_sdk()) sys.argv[i] = str(find_latest_32bit_sdk())
elif sys.argv[i] == 'latest-64bit': elif sys.argv[i] == 'latest-64bit':
sys.argv[i] = str(find_latest_64bit_sdk()) sys.argv[i] = str(find_latest_64bit_sdk())
elif sys.argv[i] == 'sdk-nightly-latest':
sys.argv[i] = str(find_latest_nightly_sdk())
elif sys.argv[i] == 'sdk-nightly-latest-32bit':
sys.argv[i] = str(find_latest_nightly_32bit_sdk())
elif sys.argv[i] == 'sdk-nightly-latest-64bit':
sys.argv[i] = str(find_latest_nightly_64bit_sdk())
if cmd == 'list': if cmd == 'list':
print('') print('')