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

Fix an issue where windows env. vars could not be read if python is not in user path when running. Closes #7 and #8.

Browse Source
This commit is contained in:
Jukka Jylänki
2014-07-03 17:56:57 +03:00
parent c3712ad118
commit 1cec00bc38
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
emsdk
View File

@@ -34,8 +34,13 @@ if platform.mac_ver()[0] != '':
ENVPATH_SEPARATOR = ':' ENVPATH_SEPARATOR = ':'
def win_get_environment_variable(key, system=True): def win_get_environment_variable(key, system=True):
import win32api, win32con prev_path = os.environ['PATH']
try: try:
py = find_used_python()
if py:
py_path = to_native_path(py.expand_vars(py.activated_path))
os.environ['PATH'] = os.environ['PATH'] + ';' + py_path
import win32api, win32con
if system: # Read globally from ALL USERS section. if system: # Read globally from ALL USERS section.
folder = win32api.RegOpenKey(win32con.HKEY_LOCAL_MACHINE, 'SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment') folder = win32api.RegOpenKey(win32con.HKEY_LOCAL_MACHINE, 'SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment')
else: # Register locally from CURRENT USER section. else: # Register locally from CURRENT USER section.
@@ -46,8 +51,10 @@ def win_get_environment_variable(key, system=True):
print >> sys.stderr, 'Failed to read environment variable ' + key + ':' print >> sys.stderr, 'Failed to read environment variable ' + key + ':'
print >> sys.stderr, str(e) print >> sys.stderr, str(e)
win32api.RegCloseKey(folder) win32api.RegCloseKey(folder)
os.environ['PATH'] = prev_path
return None return None
win32api.RegCloseKey(folder) win32api.RegCloseKey(folder)
os.environ['PATH'] = prev_path
return value return value
def win_environment_variable_exists(key, system=True): def win_environment_variable_exists(key, system=True):
@@ -773,6 +780,19 @@ def find_latest_sdk():
else: else:
return find_latest_32bit_sdk() return find_latest_32bit_sdk()
# Finds the best-matching python tool for use.
def find_used_python():
for t in reversed(tools): # Find newest tool first - those are always at the end of the list.
if t.id == 'python' and t.is_installed() and t.is_active() and t.is_env_active():
return t
for t in reversed(tools):
if t.id == 'python' and t.is_installed() and t.is_active():
return t
for t in reversed(tools):
if t.id == 'python' and t.is_installed():
return t
return None
def update_emsdk(): def update_emsdk():
if WINDOWS: if WINDOWS:
download_and_unzip(urlparse.urljoin(emsdk_packages_url, 'emsdk_windows_update.zip'), emsdk_path(), download_even_if_exists=True) download_and_unzip(urlparse.urljoin(emsdk_packages_url, 'emsdk_windows_update.zip'), emsdk_path(), download_even_if_exists=True)