Skip to content

No win32api#635

Merged
sbc100 merged 18 commits into
emscripten-core:masterfrom
aminya:no-win32api
Oct 7, 2020
Merged

No win32api#635
sbc100 merged 18 commits into
emscripten-core:masterfrom
aminya:no-win32api

Conversation

@aminya
Copy link
Copy Markdown
Contributor

@aminya aminya commented Oct 7, 2020

Revives and Closes #91

Fixes #210

Copy link
Copy Markdown
Collaborator

@sbc100 sbc100 left a comment

Choose a reason for hiding this comment

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

This is great!

Is it really this simple? We don't loose anything in this transition?

Comment thread emsdk.py Outdated
Comment thread emsdk.py Outdated
@aminya
Copy link
Copy Markdown
Contributor Author

aminya commented Oct 7, 2020

This is great!

Is it really this simple? We don't loose anything in this transition?

Thank you! Based on my personal tests and the unit tests, there is no behavior change.

If we can merge #515 before this, we can become fully sure that this works.

@aminya aminya force-pushed the no-win32api branch 2 times, most recently from 3bc0fdb to 1590416 Compare October 7, 2020 04:43
@sbc100
Copy link
Copy Markdown
Collaborator

sbc100 commented Oct 7, 2020

I'm happy to land this now if you think its safe. I've not yet has a change to look at #515 but it looks a little more invasive. Do you want to land this now or wait for #515?

@aminya
Copy link
Copy Markdown
Contributor Author

aminya commented Oct 7, 2020

I tested this with #515 on my master branch. It works:

❯ .\emsdk.ps1 activate --permanent
Registering active Emscripten environment permanently

Setting the following tools as active:
   node-12.18.1-64bit
   python-3.7.4-pywin32-64bit
   java-8.152-64bit

Adding directories to PATH:
PATH += C:\Users\aminy\Documents\GitHub\Cpp\emsdk
PATH += C:\Users\aminy\Documents\GitHub\Cpp\emsdk\node\12.18.1_64bit\bin
PATH += C:\Users\aminy\Documents\GitHub\Cpp\emsdk\python\3.7.4-pywin32_64bit
PATH += C:\Users\aminy\Documents\GitHub\Cpp\emsdk\java\8.152_64bit\bin

Setting global environment variables:
PATH = C:\Users\aminy\Documents\GitHub\Cpp\emsdk;C:\Users\aminy\Documents\GitHub\Cpp\emsdk\node\12.18.1_64bit\bin;C:\Users\aminy\Documents\GitHub\Cpp\emsdk\python\3.7.4-pywin32_64bit;C:\Users\aminy\Documents\GitHub\Cpp\emsdk\java\8.152_64bit\bin;C:\Program Files\Conan\conan;C:\Users\aminy\AppData\Local\atom\bin;C:\Program Files (x86)\JetBrains\WebStorm 2020.2\bin;C:\Users\aminy\AppData\Local\atom-nightly\bin;C:\Program Files\Google\Chrome\Application;C:\Program Files\CMake\bin
EMSDK = C:/Users/aminy/Documents/GitHub/Cpp/emsdk
EM_CONFIG = C:\Users\aminy\Documents\GitHub\Cpp\emsdk\.emscripten
EMSDK_NODE = C:\Users\aminy\Documents\GitHub\Cpp\emsdk\node\12.18.1_64bit\bin\node.exe
EMSDK_PYTHON = C:\Users\aminy\Documents\GitHub\Cpp\emsdk\python\3.7.4-pywin32_64bit\python.exe
JAVA_HOME = C:\Users\aminy\Documents\GitHub\Cpp\emsdk\java\8.152_64bit

Comment thread emsdk.py Outdated
@@ -340,15 +338,13 @@ def win_get_environment_variable(key, system=True):
py_path = to_native_path(py.expand_vars(py.activated_path))
os.environ['PATH'] = os.environ['PATH'] + ';' + py_path
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Out of interest do you have any insight as to why we over ride $PATH during this function?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Good catch. I think we don't need this anymore! This is adding the python that ships with emsdk to PATH to perform win32api operations. Considering that it is removed, we can get rid of these.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@sbc100 sbc100 merged commit 53c184e into emscripten-core:master Oct 7, 2020
akoeplinger pushed a commit to akoeplinger/emsdk that referenced this pull request Dec 13, 2024
… 20240104.2 (emscripten-core#635)

runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-arm64.Microsoft.NETCore.Runtime.ObjWriter , runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport , runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.ObjWriter , runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport , runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-musl-x64.Microsoft.NETCore.Runtime.ObjWriter , runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport , runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter , runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport , runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx-arm64.Microsoft.NETCore.Runtime.ObjWriter , runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport , runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx-x64.Microsoft.NETCore.Runtime.ObjWriter , runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport , runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.win-arm64.Microsoft.NETCore.Runtime.ObjWriter , runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport , runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.ObjWriter , runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport
 From Version 16.0.5-alpha.1.23618.1 -> To Version 16.0.5-alpha.1.24054.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

global name 'win32api' is not defined. module imported in one function, used in another

3 participants