Skip to content
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

Build wheels for windows with LuaJit #273

Merged
merged 20 commits into from
Jan 10, 2025
Merged

Build wheels for windows with LuaJit #273

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4981ef5
update setup.py
emcek Oct 11, 2024
a6ef83e
add setup VS
emcek Oct 11, 2024
8f29d66
restrict setuptools
emcek Oct 11, 2024
1c97f41
setup Setup Visual Studio only on windows
emcek Oct 11, 2024
67eafb6
x64 vs x86 for windows
emcek Oct 11, 2024
ec248ca
chnage if for Setup Visual Studio step
emcek Oct 11, 2024
7ebdc19
chnage if for Setup Visual Studio step
emcek Oct 11, 2024
b527391
exclude setuptools ver. 72.0.0
emcek Oct 11, 2024
9820d00
allow setuptools only <72.0.0
emcek Oct 11, 2024
cdbb672
test luajit21 for windows wheels
emcek Oct 11, 2024
7cd6eab
use setuptools<72 and VS cmd console
emcek Oct 11, 2024
14a10b4
force using cmd
emcek Oct 11, 2024
621df37
cmd is not needed
emcek Oct 11, 2024
ab8d073
try solve arch problem
emcek Oct 12, 2024
3dd2562
add missing quotes
emcek Oct 12, 2024
3238443
Exclude only failing setuptools version.
scoder Oct 17, 2024
2a7c4e2
Minor style improvements.
scoder Oct 17, 2024
3c6c54e
revert test-command for windows
emcek Oct 21, 2024
ef454ca
Merge branch 'master' into win_jit_poc
scoder Jan 9, 2025
a59a982
Remove redundant code from setup.py.
scoder Jan 9, 2025
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
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ environment = {CFLAGS = "-O3 -g1 -pipe -fPIC -flto -march=armv8-a -mtune=cortex-

[tool.cibuildwheel.windows]
archs = ["AMD64", "x86"]
test-command = "python -c \"import lupa\" && python -c \"import lupa.lua54\" && python -c \"import lupa.luajit21\" "
test-command = "python -c 'import lupa' && python -c 'import lupa.lua54' && python -c 'import lupa.luajit21' "

[tool.cibuildwheel.macos]
# https://cibuildwheel.readthedocs.io/en/stable/faq/#what-to-provide suggests to provide
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ def has_option(name):
or (platform == 'darwin' and 'luajit' in os.path.basename(lua_bundle_path.rstrip(os.sep)))
# Couldn't get the Windows build to work. See
# https://luajit.org/install.html#windows
or (get_machine() != "AMD64" and get_machine() != "x86_64" and 'luajit' in os.path.basename(lua_bundle_path.rstrip(os.sep)))
or (get_machine() not in ("AMD64", "x86_64") and 'luajit' in os.path.basename(lua_bundle_path.rstrip(os.sep)))
# Let's restrict LuaJIT to x86_64 for now.
or (get_machine() not in ("x86_64", "AMD64") and 'luajit' in os.path.basename(lua_bundle_path.rstrip(os.sep)))
)
Expand Down
Loading