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

Fix first run update command to also load the list of tags it fetches.

Browse Source
This commit is contained in:
Jukka Jylanki
2017-03-25 23:21:23 +02:00
parent c41c60c6d3
commit 66f063bb64
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
emsdk
View File

@@ -1812,8 +1812,6 @@ def silentremove(filename):
def main(): def main():
global emscripten_config_directory, BUILD_FOR_TESTING, ENABLE_LLVM_ASSERTIONS global emscripten_config_directory, BUILD_FOR_TESTING, ENABLE_LLVM_ASSERTIONS
load_dot_emscripten()
load_sdk_manifest()
if len(sys.argv) <= 1 or sys.argv[1] == 'help' or sys.argv[1] == '--help': if len(sys.argv) <= 1 or sys.argv[1] == 'help' or sys.argv[1] == '--help':
if len(sys.argv) <= 1: if len(sys.argv) <= 1:
@@ -1923,6 +1921,13 @@ def main():
return 1 return 1
cmd = sys.argv[1] cmd = sys.argv[1]
# On first run when tag list is not present, populate it to bootstrap.
if (cmd == 'install' or cmd == 'list') and not os.path.isfile(sdk_path('llvm-tags-64bit.txt')):
fetch_emscripten_tags()
load_dot_emscripten()
load_sdk_manifest()
# Process global args # Process global args
for i in range(2, len(sys.argv)): for i in range(2, len(sys.argv)):
if sys.argv[i].startswith('--build='): if sys.argv[i].startswith('--build='):
@@ -1943,10 +1948,6 @@ def main():
return 1 return 1
sys.argv = [x for x in sys.argv if not len(x) == 0] sys.argv = [x for x in sys.argv if not len(x) == 0]
# On first run when tag list is not present, populate it to bootstrap.
if (cmd == 'install' or cmd == 'list') and not os.path.isfile(sdk_path('llvm-tags-64bit.txt')):
fetch_emscripten_tags()
# Replace meta-packages with the real package names. # Replace meta-packages with the real package names.
if (cmd == 'update' or cmd == 'install' or cmd == 'activate'): if (cmd == 'update' or cmd == 'install' or cmd == 'activate'):
for i in range(2, len(sys.argv)): for i in range(2, len(sys.argv)):