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

Merge pull request #40 from mhenschel/mhenschel-relocatable-1

Browse Source 
Make .emscripten config file relocatable when using the --embedded flag
This commit is contained in:
juj
2015-10-06 11:52:51 -07:00
parent 340543a46a a8146983fe
commit c5933615ec
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
emsdk
View File

@@ -724,6 +724,7 @@ def generate_dot_emscripten(active_tools):
if emscripten_config_directory == emsdk_path(): if emscripten_config_directory == emsdk_path():
temp_dir = sdk_path('tmp') temp_dir = sdk_path('tmp')
mkdir_p(temp_dir) mkdir_p(temp_dir)
embedded=True
else: else:
temp_dir = tempfile.gettempdir().replace('\\', '/') temp_dir = tempfile.gettempdir().replace('\\', '/')
@@ -731,6 +732,9 @@ def generate_dot_emscripten(active_tools):
has_node = False has_node = False
cfg = 'import os\n' cfg = 'import os\n'
if embedded:
cfg += 'emsdk_path=os.path.dirname(EM_CONFIG)\n'
for tool in active_tools: for tool in active_tools:
tool_cfg = tool.activated_config() tool_cfg = tool.activated_config()
@@ -754,6 +758,9 @@ COMPILER_ENGINE = NODE_JS
JS_ENGINES = [NODE_JS] JS_ENGINES = [NODE_JS]
''' '''
if embedded:
cfg = cfg.replace(emscripten_config_directory, '\' + emsdk_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.