bpo-40859: Update Windows build to use xz-5.2.5 (GH-20622)

Co-authored-by: Ma Lin <animalize@users.noreply.github.com>
(cherry picked from commit 73af4b0264aeb866536b01a132f8c26a5808d64d)

Co-authored-by: Steve Dower <steve.dower@python.org>

diff --git a/Misc/NEWS.d/next/Windows/2020-06-04-10-42-04.bpo-40859.isKSw7.rst b/Misc/NEWS.d/next/Windows/2020-06-04-10-42-04.bpo-40859.isKSw7.rst
new file mode 100644 (file)
index 0000000..ef4c727
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2020-06-04-10-42-04.bpo-40859.isKSw7.rst
@@ -0,0 +1 @@
+Update Windows build to use xz-5.2.5

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index dc5c909de7441809cfc27acae1637dd5e1e983f0..ee79addd44d02b78a33f9905d818979be8cc28c7 100644 (file)
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -58,7 +58,7 @@ set libraries=%libraries%                                       sqlite-3.37.2.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.12.0
 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 (

diff --git a/PCbuild/liblzma.vcxproj b/PCbuild/liblzma.vcxproj
index a6bd59ec0baa3d23c36982f1f160a751cce27137..4dd42ab98a9759de24b00844a6b6773c47ff795a 100644 (file)
--- a/PCbuild/liblzma.vcxproj
+++ b/PCbuild/liblzma.vcxproj
@@ -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>
@@ -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">

diff --git a/PCbuild/liblzma.vcxproj.filters b/PCbuild/liblzma.vcxproj.filters
index 3f58351fa9edb6ab338f1e2fa163b6a3247b3b14..ebe2a7d5fa9e5daed9ebb8d7d8885588caa78056 100644 (file)
--- a/PCbuild/liblzma.vcxproj.filters
+++ b/PCbuild/liblzma.vcxproj.filters
@@ -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>

diff --git a/PCbuild/python.props b/PCbuild/python.props
index 7b42037b7cdf87952f27b45ebc26c444359c3b55..c451429da2c827bf7e77738ff2daf80493462d61 100644 (file)
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -59,7 +59,7 @@
     <ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
     <sqlite3Dir>$(ExternalsDir)sqlite-3.37.2.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.3.0\</libffiDir>
     <libffiOutDir>$(ExternalsDir)libffi-3.3.0\$(ArchName)\</libffiOutDir>
     <libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>