Skip to content

Support emsdk --embedded mode #10935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbc100 merged 4 commits into from
Apr 17, 2020
Merged

Support emsdk --embedded mode #10935

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de01380
Support emsdk --embedded mode
sbc100 Apr 16, 2020
bb27346
feedback
sbc100 Apr 16, 2020
66a9e27
more comments
sbc100 Apr 16, 2020
1f6e313
.
sbc100 Apr 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions tools/shared.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,12 @@ def generate_config(path, first_time=False):
# 4. Fall back users home directory (~/.emscripten).

embedded_config = path_from_root('.emscripten')
# For compatibility with emsdk --embedded mode also look two levels up. This
Copy link
Member

@kripken kripken Apr 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe mention why two levels up? That is, that when using the emsdk, the structure would look like

emsdk/
  emscripten/

But that picture must be wrong since you say two levels and not one..?

# could be removed if emsdk was to use the emscripten directory itself for the
# embedded config: https://github.com/emscripten-core/emsdk/pull/367
emsdk_root = os.path.dirname(os.path.dirname(__rootpath__))
emsdk_embedded_config = os.path.join(emsdk_root, '.emscripten')

if '--em-config' in sys.argv:
EM_CONFIG = sys.argv[sys.argv.index('--em-config') + 1]
# And now remove it from sys.argv
Expand All @@ -289,6 +295,8 @@ def generate_config(path, first_time=False):
EM_CONFIG = os.environ['EM_CONFIG']
elif os.path.exists(embedded_config):
EM_CONFIG = embedded_config
elif os.path.exists(emsdk_embedded_config):
EM_CONFIG = emsdk_embedded_config
else:
EM_CONFIG = '~/.emscripten'

Expand Down