Skip to content

bpo-40859: Update Windows build to use xz-5.2.5 #20622

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

Jump to bottom
Merged
merged 4 commits into from Apr 19, 2022
Merged

bpo-40859: Update Windows build to use xz-5.2.5 #20622

merged 4 commits into from Apr 19, 2022

Conversation

ghost
Copy link

@ghost ghost commented Jun 4, 2020 •
edited by bedevere-bot
Loading

@ghost ghost self-requested a review as a code owner June 4, 2020 02:44
@animalize animalize mannequin mentioned this pull request Apr 16, 2022
Closed
@gpshead gpshead requested a review from zooba April 16, 2022 20:47
@zooba
Copy link
Member

zooba commented Apr 18, 2022

I'll get the sources pushed to the repo we use later tonight. (Can't seem to mark this as unread, so mention me again if it seems like I've forgotten.)

@ghost
Copy link

ghost commented Apr 18, 2022 •
edited by ghost
Loading

All commit authors signed the Contributor License Agreement.
CLA signed

@wjssz
update config.h path
22f4547 
in xz-5.2.2: $(lzmaDir)windows\config.h
in xz-5.2.5: $(lzmaDir)windows\vs2019\config.h
@zooba
Copy link
Member

zooba commented Apr 18, 2022

The xz sources are up now, and I copied the config.h into the right place, so all should be fine.

@ghost
Copy link
Author

ghost commented Apr 18, 2022

The xz sources are up now, and I copied the config.h into the right place, so all should be fine.

I updated project configure files, it works if don't copy config.h manually.

@zooba zooba merged commit a059395 into python:main Apr 19, 2022
@miss-islington
Copy link
Contributor

Thanks @animalize for the PR, and @zooba for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @animalize and @zooba, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker a059395921e4402c13a860aaa8fc44fea2023aa3 3.10

@zooba
Copy link
Member

zooba commented Apr 19, 2022

The change for include directory isn't any worse than what we had before, but we might want to make it conditional on VS version if it starts breaking for people using earlier/later releases (though I don't see why there'd be differences between the files)

@bedevere-bot
Copy link

GH-91714 is a backport of this pull request to the 3.10 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Apr 19, 2022
zooba pushed a commit to zooba/cpython that referenced this pull request Apr 19, 2022
@zooba
bpo-40859: Update Windows build to use xz-5.2.5 (pythonGH-20622)
ca4d78a
@ghost ghost deleted the update_xz branch April 20, 2022 02:13
@ghost
Copy link
Author

ghost commented Apr 20, 2022

I compared, the contents of these 3 files are same, except the comment at the first line.

  • vs2013/config.h
  • vs2017/config.h
  • vs2019/config.h

Earlier version MSVC can also use vs2019/config.h.

zooba added a commit that referenced this pull request Apr 20, 2022
@zooba
bpo-40859: Update Windows build to use xz-5.2.5 (GH-20622)
73af4b0 
Co-authored-by: Ma Lin <animalize@users.noreply.github.com>
miss-islington added a commit that referenced this pull request Apr 20, 2022
@miss-islington @zooba
bpo-40859: Update Windows build to use xz-5.2.5 (GH-20622)
1fce689 
Co-authored-by: Ma Lin <animalize@users.noreply.github.com>
(cherry picked from commit 73af4b0)

Co-authored-by: Steve Dower <steve.dower@python.org>
hello-adam pushed a commit to hello-adam/cpython that referenced this pull request Jun 2, 2022
@miss-islington @zooba @hello-adam
bpo-40859: Update Windows build to use xz-5.2.5 (pythonGH-20622)
b7fd775 
Co-authored-by: Ma Lin <animalize@users.noreply.github.com>
(cherry picked from commit 73af4b0)

Co-authored-by: Steve Dower <steve.dower@python.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zooba zooba Awaiting requested review from zooba

Assignees

@zooba zooba

Labels
OS-windows
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@zooba @miss-islington @bedevere-bot @gpshead @the-knights-who-say-ni @wjssz