gh-145219: Emscripten bld configurable directory & only clean Emscripten#145581
gh-145219: Emscripten bld configurable directory & only clean Emscripten#145581freakboy3742 merged 4 commits intopython:mainfrom
Conversation
61484f5 to
61bbce7
Compare
…mscripten Two small changes to the Emscripten build script: 1. Make clean only delete the parts of cross-build that are emscripten specific 2. Make the cross-build name configurable
61bbce7 to
a124b32
Compare
|
!buildbot emscripten |
|
🤖 New build scheduled with the buildbot fleet by @freakboy3742 for commit a124b32 🤖 Results will be shown at: https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F145581%2Fmerge The command will test the builders whose names match following regular expression: The builders matched are:
|
|
!buildbot emscripten |
|
🤖 New build scheduled with the buildbot fleet by @freakboy3742 for commit 084133a 🤖 Results will be shown at: https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F145581%2Fmerge The command will test the builders whose names match following regular expression: The builders matched are:
|
freakboy3742
left a comment
There was a problem hiding this comment.
Looks good; I've pushed one small feature (being able to optionally clean build as well), and one bug (resolving the user-provided cross-build path) fix; with those, we should be good to go.
Tools/wasm/emscripten/__main__.py
Outdated
| """Compute all build paths from the given cross-build directory.""" | ||
| if cross_build_dir is None: | ||
| cross_build_dir = DEFAULT_CROSS_BUILD_DIR | ||
| cross_build_dir = Path(cross_build_dir) |
There was a problem hiding this comment.
This path needs to be resolved or a value of ./cross-build-3.15 will fail:
| cross_build_dir = Path(cross_build_dir) | |
| cross_build_dir = Path(cross_build_dir).absolute() |
|
Thanks @hoodmane for the PR, and @freakboy3742 for merging it 🌮🎉.. I'm working now to backport this PR to: 3.14. |
…pythonGH-145581) Modifies the Emscripten build script to allow for custom cross-build directory names, and to only clean Emscripten-specific paths (optionally including the build python). (cherry picked from commit 015613384fea7a00bb2077760e325e5baab6814b) Co-authored-by: Hood Chatham <roberthoodchatham@gmail.com> Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
|
GH-145654 is a backport of this pull request to the 3.14 branch. |
GH-145581) (#145654) Modifies the Emscripten build script to allow for custom cross-build directory names, and to only clean Emscripten-specific paths (optionally including the build python). (cherry picked from commit 0156133) Co-authored-by: Hood Chatham <roberthoodchatham@gmail.com> Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
Two small changes to the Emscripten build script:
cc @freakboy3742.