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

Document --global in more places.

Browse Source
This commit is contained in:
Jukka Jylanki
2014-09-17 10:09:18 +03:00
parent e26c839e82
commit 030dc264cc
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -131,7 +131,7 @@ On Windows, you can directly install an old SDK version by using one of the arch
##### How do I change the currently active SDK version? ##### How do I change the currently active SDK version?
You can toggle between different tools and SDK versions by running `emsdk activate <tool/sdk name>`. Activating a tool will set up `~/.emscripten` to point to that particular tool. You can toggle between different tools and SDK versions by running `emsdk activate <tool/sdk name>`. Activating a tool will set up `~/.emscripten` to point to that particular tool. On Windows, you can pass the option `--global` to the `activate` command to register the environment permanently to the system registry for all users.
##### How do I track the latest Emscripten development with the SDK? ##### How do I track the latest Emscripten development with the SDK?

19
emsdk
View File

@@ -1163,14 +1163,25 @@ def main():
emsdk install <tool/sdk> - Downloads and installs the given tool or SDK. emsdk install <tool/sdk> - Downloads and installs the given tool or SDK.
emsdk uninstall <tool/sdk> - Removes the given tool or SDK from disk. emsdk uninstall <tool/sdk> - Removes the given tool or SDK from disk.
emsdk activate <tool/sdk> - Permanently activates the given tool or SDK as emsdk activate <tool/sdk> - Activates the given tool or SDK in the
the default tool in the system environment.''' environment of the current shell.'''
if WINDOWS: if WINDOWS:
print ''' print '''
emsdk activate [--global] <tool/sdk> - Activates the given tool or SDK in
the environment of the current
shell. If the --global option is
passed, the registration is done
globally to all users in the system
environment.
emcmdprompt.bat - Spawns a new command prompt window with the emcmdprompt.bat - Spawns a new command prompt window with the
Emscripten environment active.''' Emscripten environment active.'''
else:
print '''
emsdk activate <tool/sdk> - Activates the given tool or SDK in the
environment of the current shell.'''
return 1 return 1
cmd = sys.argv[1] cmd = sys.argv[1]
@@ -1261,6 +1272,8 @@ def main():
return 1 return 1
tools_to_activate += [tool] tools_to_activate += [tool]
tools_to_activate = set_active_tools(tools_to_activate, permanently_activate=permanently_activate) tools_to_activate = set_active_tools(tools_to_activate, permanently_activate=permanently_activate)
if WINDOWS and not permanently_activate:
print 'To permanently register this environment globally to all users in Windows Registry, rerun the command with the option --global.'
return 0 return 0
elif cmd == 'install': elif cmd == 'install':
if len(sys.argv) <= 2: if len(sys.argv) <= 2: