GH-132983: Build _zstd on Windows

Misc/externals.spdx.json

@@ -190,6 +190,27 @@
       "name": "zlib-ng",
       "primaryPackagePurpose": "SOURCE",
       "versionInfo": "2.2.4"
+    },
+    {
+      "SPDXID": "SPDXRef-PACKAGE-zstd",
+      "checksums": [
+        {
+          "algorithm": "SHA256",
+          "checksumValue": "f24b52470d12f466e9fa4fcc94e6c530625ada51d7b36de7fdc6ed7e6f499c8e"
+        }
+      ],
+      "downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/zstd-1.5.7.tar.gz",
+      "externalRefs": [
+        {
+          "referenceCategory": "SECURITY",
+          "referenceLocator": "cpe:2.3:a:facebook:zstandard:1.5.7:*:*:*:*:*:*:*",
+          "referenceType": "cpe23Type"
+        }
+      ],
+      "licenseConcluded": "NOASSERTION",
+      "name": "zstd",
+      "primaryPackagePurpose": "SOURCE",
+      "versionInfo": "1.5.7"
     }
   ],
   "spdxVersion": "SPDX-2.3"

Modules/Setup

@@ -200,8 +200,8 @@ PYTHONPATH=$(COREPYTHONPATH)
 #_dbm _dbmmodule.c -lgdbm_compat -DUSE_GDBM_COMPAT
 #_gdbm _gdbmmodule.c -lgdbm
 #_lzma _lzmamodule.c -llzma
-#_zstd _zstd/_zstdmodule.c -lzstd -I$(srcdir)/Modules/_zstd
 #_uuid _uuidmodule.c -luuid
+#_zstd _zstd/_zstdmodule.c -lzstd -I$(srcdir)/Modules/_zstd
 #zlib  zlibmodule.c -lz
 
 # The readline module also supports libeditline (-leditline).

Modules/Setup.stdlib.in

@@ -69,7 +69,7 @@
 @MODULE_BINASCII_TRUE@binascii binascii.c
 @MODULE__BZ2_TRUE@_bz2 _bz2module.c
 @MODULE__LZMA_TRUE@_lzma _lzmamodule.c
-@MODULE__ZSTD_TRUE@_zstd _zstd/_zstdmodule.c _zstd/zdict.c _zstd/compressor.c _zstd/decompressor.c
+@MODULE__ZSTD_TRUE@_zstd _zstd/_zstdmodule.c _zstd/zstddict.c _zstd/compressor.c _zstd/decompressor.c
 @MODULE_ZLIB_TRUE@zlib zlibmodule.c
 
 # dbm/gdbm

Modules/_zstd/zdict.c → Modules/_zstd/zstddict.c

@@ -136,7 +136,7 @@ _zstd_ZstdDict___init___impl(ZstdDict *self, PyObject *dict_content,
 }
 
 #define clinic_state() (get_zstd_state(type))
-#include "clinic/zdict.c.h"
+#include "clinic/zstddict.c.h"
 #undef clinic_state
 
 PyDoc_STRVAR(ZstdDict_dictid_doc,

PCbuild/_zstd.vcxproj

@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="PGInstrument|ARM">
+      <Configuration>PGInstrument</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="PGInstrument|ARM64">
+      <Configuration>PGInstrument</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="PGInstrument|Win32">
+      <Configuration>PGInstrument</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="PGInstrument|x64">
+      <Configuration>PGInstrument</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="PGUpdate|ARM">
+      <Configuration>PGUpdate</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="PGUpdate|ARM64">
+      <Configuration>PGUpdate</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="PGUpdate|Win32">
+      <Configuration>PGUpdate</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="PGUpdate|x64">
+      <Configuration>PGUpdate</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{07029b86-f3e9-443e-86fb-78aa6d47fed1}</ProjectGuid>
+    <RootNamespace>_zstd</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="python.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <PropertyGroup>
+    <TargetExt>$(PyStdlibPydExt)</TargetExt>
+  </PropertyGroup>
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="pyproject.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;ZSTD_MULTITHREAD=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(zstdDir)lib\;$(zstdDir)lib\common;$(zstdDir)lib\compress;$(zstdDir)lib\decompress;$(zstdDir)lib\dictBuilder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Modules\_zstd\_zstdmodule.c" />
+    <ClCompile Include="..\Modules\_zstd\compressor.c" />
+    <ClCompile Include="..\Modules\_zstd\decompressor.c" />
+    <ClCompile Include="..\Modules\_zstd\zstddict.c" />
+    <ClCompile Include="$(zstdDir)lib\common\debug.c" />
+    <ClCompile Include="$(zstdDir)lib\common\entropy_common.c" />
+    <ClCompile Include="$(zstdDir)lib\common\error_private.c" />
+    <ClCompile Include="$(zstdDir)lib\common\fse_decompress.c" />
+    <ClCompile Include="$(zstdDir)lib\common\pool.c" />
+    <ClCompile Include="$(zstdDir)lib\common\threading.c" />
+    <ClCompile Include="$(zstdDir)lib\common\xxhash.c" />
+    <ClCompile Include="$(zstdDir)lib\common\zstd_common.c" />
+    <ClCompile Include="$(zstdDir)lib\compress\fse_compress.c" />
+    <ClCompile Include="$(zstdDir)lib\compress\hist.c" />
+    <ClCompile Include="$(zstdDir)lib\compress\huf_compress.c" />
+    <ClCompile Include="$(zstdDir)lib\compress\zstd_compress.c" />
+    <ClCompile Include="$(zstdDir)lib\compress\zstd_compress_literals.c" />
+    <ClCompile Include="$(zstdDir)lib\compress\zstd_compress_sequences.c" />
+    <ClCompile Include="$(zstdDir)lib\compress\zstd_compress_superblock.c" />
+    <ClCompile Include="$(zstdDir)lib\compress\zstd_double_fast.c" />
+    <ClCompile Include="$(zstdDir)lib\compress\zstd_fast.c" />
+    <ClCompile Include="$(zstdDir)lib\compress\zstd_lazy.c" />
+    <ClCompile Include="$(zstdDir)lib\compress\zstd_ldm.c" />
+    <ClCompile Include="$(zstdDir)lib\compress\zstd_opt.c" />
+    <ClCompile Include="$(zstdDir)lib\compress\zstd_preSplit.c" />
+    <ClCompile Include="$(zstdDir)lib\compress\zstdmt_compress.c" />
+    <ClCompile Include="$(zstdDir)lib\decompress\huf_decompress.c" />
+    <ClCompile Include="$(zstdDir)lib\decompress\zstd_ddict.c" />
+    <ClCompile Include="$(zstdDir)lib\decompress\zstd_decompress.c" />
+    <ClCompile Include="$(zstdDir)lib\decompress\zstd_decompress_block.c" />
+    <ClCompile Include="$(zstdDir)lib\dictBuilder\cover.c" />
+    <ClCompile Include="$(zstdDir)lib\dictBuilder\divsufsort.c" />
+    <ClCompile Include="$(zstdDir)lib\dictBuilder\fastcover.c" />
+    <ClCompile Include="$(zstdDir)lib\dictBuilder\zdict.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Modules\_zstd\_zstdmodule.h" />
+    <ClInclude Include="..\Modules\_zstd\buffer.h" />
+    <ClInclude Include="$(zstdDir)lib\common\bitstream.h" />
+    <ClInclude Include="$(zstdDir)lib\common\error_private.h" />
+    <ClInclude Include="$(zstdDir)lib\common\fse.h" />
+    <ClInclude Include="$(zstdDir)lib\common\huf.h" />
+    <ClInclude Include="$(zstdDir)lib\common\mem.h" />
+    <ClInclude Include="$(zstdDir)lib\common\pool.h" />
+    <ClInclude Include="$(zstdDir)lib\common\threading.h" />
+    <ClInclude Include="$(zstdDir)lib\common\xxhash.h" />
+    <ClInclude Include="$(zstdDir)lib\common\zstd_internal.h" />
+    <ClInclude Include="$(zstdDir)lib\compress\zstd_compress.h" />
+    <ClInclude Include="$(zstdDir)lib\compress\zstd_compress_literals.h" />
+    <ClInclude Include="$(zstdDir)lib\compress\zstd_compress_sequences.h" />
+    <ClInclude Include="$(zstdDir)lib\compress\zstd_compress_superblock.h" />
+    <ClInclude Include="$(zstdDir)lib\compress\zstd_cwksp.h" />
+    <ClInclude Include="$(zstdDir)lib\compress\zstd_double_fast.h" />
+    <ClInclude Include="$(zstdDir)lib\compress\zstd_fast.h" />
+    <ClInclude Include="$(zstdDir)lib\compress\zstd_lazy.h" />
+    <ClInclude Include="$(zstdDir)lib\compress\zstd_ldm.h" />
+    <ClInclude Include="$(zstdDir)lib\compress\zstd_opt.h" />
+    <ClInclude Include="$(zstdDir)lib\compress\zstdmt_compress.h" />
+    <ClInclude Include="$(zstdDir)lib\decompress\zstd_ddict.h" />
+    <ClInclude Include="$(zstdDir)lib\zstd.h" />
+    <ClInclude Include="$(zstdDir)lib\zstd_errors.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\PC\python_nt.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="pythoncore.vcxproj">
+      <Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>