Skip to content

Set user environment variables by default when giving --global in Windows #468

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

Closed
saschanaz wants to merge 2 commits into from
Closed

Set user environment variables by default when giving --global in Windows #468

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfeec19
Set user environment variables by default in Windows
saschanaz Apr 12, 2020
f65eeef
remove redundant parameter
saschanaz Apr 12, 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
29 changes: 10 additions & 19 deletions emsdk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1800,18 +1800,13 @@ def is_env_active(self):
return False
return True

def win_activate_env_vars(self, permanently_activate):
def win_activate_env_vars(self, system):
if WINDOWS:
envs = self.activated_environment()
for env in envs:
key, value = parse_key_value(env)

if permanently_activate:
# If there is an env var for the LOCAL USER with same name, it will
# hide the system var, so must remove that first.
win_delete_environment_variable(key, False)

win_set_environment_variable(key, value, permanently_activate)
win_set_environment_variable(key, value, system)

# If this tool can be installed on this system, this function returns True.
# Otherwise, this function returns a string that describes the reason why this
Expand Down Expand Up @@ -2509,7 +2504,7 @@ def copy_pregenerated_cache(tools_to_activate):
# Reconfigure .emscripten to choose the currently activated toolset, set PATH
# and other environment variables.
# Returns the full list of deduced tools that are now active.
def set_active_tools(tools_to_activate, permanently_activate):
def set_active_tools(tools_to_activate, permanently_activate, system):
tools_to_activate = process_tool_list(tools_to_activate, log_errors=True)

generate_dot_emscripten(tools_to_activate)
Expand All @@ -2533,13 +2528,13 @@ def set_active_tools(tools_to_activate, permanently_activate):
if WINDOWS and permanently_activate:
# Individual env. vars
for tool in tools_to_activate:
tool.win_activate_env_vars(permanently_activate=True)
tool.win_activate_env_vars(system=system)

# PATH variable
newpath, added_items = adjusted_path(tools_to_activate, system_path_only=True)
newpath, added_items = adjusted_path(tools_to_activate, system=system)
# Are there any actual changes?
if newpath != os.environ['PATH']:
win_set_environment_variable('PATH', newpath, system=True)
win_set_environment_variable('PATH', newpath, system=system)

if len(tools_to_activate) > 0:
tools = [x for x in tools_to_activate if not x.is_sdk]
Expand Down Expand Up @@ -2589,17 +2584,12 @@ def to_msys_path(p):

# Looks at the current PATH and adds and removes entries so that the PATH reflects
# the set of given active tools.
def adjusted_path(tools_to_activate, log_additions=False, system_path_only=False):
def adjusted_path(tools_to_activate, system=False):
# These directories should be added to PATH
path_add = get_required_path(tools_to_activate)
# These already exist.
if WINDOWS and not MSYS:
existing_path = win_get_environment_variable('PATH', system=True)
if not system_path_only:
current_user_path = win_get_environment_variable('PATH', system=False)
if current_user_path:
existing_path += ENVPATH_SEPARATOR + current_user_path
existing_path = existing_path.split(ENVPATH_SEPARATOR)
existing_path = win_get_environment_variable('PATH', system=system).split(ENVPATH_SEPARATOR)
else:
existing_path = os.environ['PATH'].split(ENVPATH_SEPARATOR)
emsdk_root_path = to_unix_path(emsdk_path())
Expand Down Expand Up @@ -2842,6 +2832,7 @@ def extract_bool_arg(name):
arg_old = extract_bool_arg('--old')
arg_uses = extract_bool_arg('--uses')
arg_global = extract_bool_arg('--global')
arg_system = extract_bool_arg('--system')
Copy link
Copy Markdown
Contributor

@aminya aminya Sep 15, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

If arg_system is provided but arg_global is not, it should automatically set that. In other words, system means permanent too!

Suggested change
arg_system = extract_bool_arg('--system')
arg_system = extract_bool_arg('--system')
if arg_system
arg_global=True

arg_embedded = extract_bool_arg('--embedded')
arg_notty = extract_bool_arg('--notty')
if arg_notty:
Expand Down Expand Up @@ -3092,7 +3083,7 @@ def print_tools(t):
if len(tools_to_activate) == 0:
print('No tools/SDKs specified to activate! Usage:\n emsdk activate tool/sdk1 [tool/sdk2] [...]')
return 1
tools_to_activate = set_active_tools(tools_to_activate, permanently_activate=arg_global)
tools_to_activate = set_active_tools(tools_to_activate, permanently_activate=arg_global, system=arg_system)
if len(tools_to_activate) == 0:
print('No tools/SDKs found to activate! Usage:\n emsdk activate tool/sdk1 [tool/sdk2] [...]')
return 1
Expand Down