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

Merged
merged 4 commits into from Apr 19, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2dc11ae
Update Windows build to use xz-5.2.5
wjssz Jun 4, 2020
e352f62
Merge branch 'main' into update_xz
gpshead Apr 16, 2022
26ddbc0
Merge branch 'main' into update_xz
animalize Apr 18, 2022
22f4547
update `config.h` path
wjssz Apr 18, 2022
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
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Windows/2020-06-04-10-42-04.bpo-40859.isKSw7.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update Windows build to use xz-5.2.5
2 changes: 1 addition & 1 deletion PCbuild/get_externals.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ set libraries=%libraries% sqlite-3.38.1.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12.1
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.12.1
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6
set libraries=%libraries% xz-5.2.2
set libraries=%libraries% xz-5.2.5
set libraries=%libraries% zlib-1.2.12

for %%e in (%libraries%) do (
Expand Down
4 changes: 2 additions & 2 deletions PCbuild/liblzma.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(lzmaDir)windows;$(lzmaDir)src/liblzma/common;$(lzmaDir)src/common;$(lzmaDir)src/liblzma/api;$(lzmaDir)src/liblzma/check;$(lzmaDir)src/liblzma/delta;$(lzmaDir)src/liblzma/lz;$(lzmaDir)src/liblzma/lzma;$(lzmaDir)src/liblzma/rangecoder;$(lzmaDir)src/liblzma/simple;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(lzmaDir)windows/vs2019;$(lzmaDir)src/liblzma/common;$(lzmaDir)src/common;$(lzmaDir)src/liblzma/api;$(lzmaDir)src/liblzma/check;$(lzmaDir)src/liblzma/delta;$(lzmaDir)src/liblzma/lz;$(lzmaDir)src/liblzma/lzma;$(lzmaDir)src/liblzma/rangecoder;$(lzmaDir)src/liblzma/simple;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4028;4113;4133;4244;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
Expand Down Expand Up @@ -238,7 +238,7 @@
<ClInclude Include="$(lzmaDir)src\liblzma\simple\simple_decoder.h" />
<ClInclude Include="$(lzmaDir)src\liblzma\simple\simple_encoder.h" />
<ClInclude Include="$(lzmaDir)src\liblzma\simple\simple_private.h" />
<ClInclude Include="$(lzmaDir)windows\config.h" />
<ClInclude Include="$(lzmaDir)windows\vs2019\config.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
2 changes: 1 addition & 1 deletion PCbuild/liblzma.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@
<ClInclude Include="$(lzmaDir)src\liblzma\simple\simple_private.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(lzmaDir)windows\config.h">
<ClInclude Include="$(lzmaDir)windows\vs2019\config.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion PCbuild/python.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
<sqlite3Dir>$(ExternalsDir)sqlite-3.38.1.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
<lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
<lzmaDir>$(ExternalsDir)xz-5.2.5\</lzmaDir>
<libffiDir>$(ExternalsDir)libffi-3.4.2\</libffiDir>
<libffiOutDir>$(ExternalsDir)libffi-3.4.2\$(ArchName)\</libffiOutDir>
<libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
Expand Down