Skip to content

gh-127503: Emscripten make Python.sh function as proper Python CLI #127506

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
freakboy3742 merged 15 commits into from
Dec 5, 2024
Merged

gh-127503: Emscripten make Python.sh function as proper Python CLI #127506

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
dc865d7
Fix realpath usage on systems with bsd coreutils
hoodmane Dec 2, 2024
18f0424
Mount all native directories that aren't known to cause trouble
hoodmane Dec 2, 2024
38b1f7a
Pass environment variables into Emscripten
hoodmane Dec 2, 2024
4d45279
Change make target from commoninstall to all
hoodmane Dec 2, 2024
af99603
Pass flags in NODEFLAGS environment variable to node
hoodmane Dec 2, 2024
f941192
Apply mdboom's review comments
hoodmane Dec 2, 2024
351aa4f
Fix NODEFLAGS reference
hoodmane Dec 2, 2024
1e43493
Fix NODEFLAGS
hoodmane Dec 2, 2024
af17844
Fix python.sh template
hoodmane Dec 3, 2024
ca741bc
Be more careful with handling of the program name
hoodmane Dec 3, 2024
60875c0
Apply code formatter
hoodmane Dec 3, 2024
63d57c8
Redirect realpath --version to /dev/null again
hoodmane Dec 3, 2024
f9c9ace
Cleanup
hoodmane Dec 3, 2024
f70b15f
Merge branch 'main' into emscripten-cli-fixes
hoodmane Dec 3, 2024
ca2abc3
Put back in f string
hoodmane Dec 4, 2024
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
Prev Previous commit
Next Next commit
Fix NODEFLAGS
  • Loading branch information
@hoodmane
hoodmane committed Dec 2, 2024
commit 1e434938b78feff62d0b1837164fad5a01f473e5
2 changes: 1 addition & 1 deletion Tools/wasm/emscripten/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ def configure_emscripten_python(context, working_dir):
# We compute our own path, not following symlinks and pass it in so that
# node_entry.mjs can set sys.executable correctly.
# Intentionally allow word splitting on NODEFLAGS.
exec {host_runner} {node_entry} $NODEFLAGS "$($REALPATH "$0")" "$@"
exec node $NODEFLAGS /home/rchatham/cpython/cross-build/wasm32-emscripten/node_entry.mjs "$($REALPATH "$0")" "$@"
Comment thread
hoodmane marked this conversation as resolved.
Outdated
"""
)
)
Expand Down
9 changes: 5 additions & 4 deletions Tools/wasm/emscripten/node_entry.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,21 @@ function mountDirectories(Module) {
}
}

const pythonShIndex = process.argv.findIndex(x => x.endsWith("python.sh"));

const settings = {
preRun(Module) {
Module.FS.mkdirTree("/home/");
mountDirectories(Module);
Module.FS.chdir(process.cwd());
Object.assign(Module.ENV, process.env);
Comment thread
hoodmane marked this conversation as resolved.
},
// The first three arguments are: "node", path to this file, path to
// python.sh. After that come the arguments the user passed to python.sh.
arguments: process.argv.slice(3),
// Ensure that sys.executable, sys._base_executable, etc point to python.sh
// not to this file. To properly handle symlinks, python.sh needs to compute
// its own path.
thisProgram: process.argv[2],
thisProgram: process.argv[pythonShIndex],
// After python.sh come the arguments that the user passed to python.sh.
arguments: process.argv.slice(pythonShIndex + 1),
};

await EmscriptenModule(settings);