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

Back up overwritten configuration files (#295)

Browse Source
This commit is contained in:
Thomas Lively
2019-07-03 16:11:00 -07:00
committed by GitHub
parent c3f0e0fc0d
commit 35cd9268f0
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
emsdk
View File

@@ -1232,6 +1232,11 @@ JS_ENGINES = [NODE_JS]
if embedded: if embedded:
cfg = cfg.replace(emscripten_config_directory, "' + emsdk_path + '") cfg = cfg.replace(emscripten_config_directory, "' + emsdk_path + '")
if os.path.exists(dot_emscripten_path()):
backup_path = dot_emscripten_path() + ".old"
print("Backing up old Emscripten configuration file in " + os.path.normpath(backup_path))
move_with_overwrite(dot_emscripten_path(), backup_path)
with open(dot_emscripten_path(), "w") as text_file: text_file.write(cfg) with open(dot_emscripten_path(), "w") as text_file: text_file.write(cfg)
# Clear old cached emscripten content. # Clear old cached emscripten content.

3
test.py
View File

@@ -104,7 +104,9 @@ assert not os.path.exists(LIBC)
print('test tot-upstream') print('test tot-upstream')
check_call('./emsdk install tot-upstream') check_call('./emsdk install tot-upstream')
assert not os.path.exists(LIBC) assert not os.path.exists(LIBC)
old_config = open(os.path.expanduser('~/.emscripten')).read()
check_call('./emsdk activate tot-upstream') check_call('./emsdk activate tot-upstream')
assert old_config == open(os.path.expanduser('~/.emscripten.old')).read()
assert os.path.exists(LIBC), 'activation supplies prebuilt libc' # TODO; test on latest as well assert os.path.exists(LIBC), 'activation supplies prebuilt libc' # TODO; test on latest as well
check_call('upstream/emscripten/emcc hello_world.cpp') check_call('upstream/emscripten/emcc hello_world.cpp')
@@ -162,4 +164,3 @@ for os, suffix in [
url = 'https://storage.googleapis.com/webassembly/emscripten-releases-builds/%s/%s/wasm-binaries.%s' % (os, latest_hash, suffix) url = 'https://storage.googleapis.com/webassembly/emscripten-releases-builds/%s/%s/wasm-binaries.%s' % (os, latest_hash, suffix)
print(' url: ' + url), print(' url: ' + url),
check_call('wget ' + url) check_call('wget ' + url)