8000 GH-132983: Build ``_zstd`` on Windows by AA-Turner · Pull Request #133366 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

GH-132983: Build _zstd on Windows #133366

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 7 commits into from
May 5, 2025
Merged

GH-132983: Build _zstd on Windows #133366

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2563adf
Sorting
AA-Turner May 4, 2025
93c78cc
Add Zstandard projects
AA-Turner May 4, 2025
a0cfc5d
Zstandard scaffold
AA-Turner May 4, 2025
b9208b6
Add dependency of _zstd to python
AA-Turner May 5, 2025
755919f
Combine zstd.vcxproj into _zstd.vcxproj
AA-Turner May 5, 2025
17149df
Rename `Modules\zdict.c` to `zstddict.c`
AA-Turner May 5, 2025
1ae3a76
Point $(zstdDir) to the root
AA-Turner May 5, 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
Prev Previous commit
Next Next commit
Rename Modules\zdict.c to zstddict.c 
MSB8027: Two or more files with the name of zdict.c will produce outputs to the same location. This can lead to an incorrect build result.  The files involved are ..\Modules\_zstd\zdict.c, \externals\zstd-1.5.7\lib\dictBuilder\zdict.c.
  • Loading branch information
@AA-Turner
AA-Turner committed May 5, 2025
commit 17149dfff7d72480e0089ed9f8dd7375c963edb7
2 changes: 1 addition & 1 deletion Modules/Setup.stdlib.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 Modules/_zstd/clinic/zdict.c.h → Modules/_zstd/clinic/zstddict.c.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Modules/_zstd/zdict.c → Modules/_zstd/zstddict.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion PCbuild/_zstd.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<ClCompile Include="..\Modules\_zstd\_zstdmodule.c" />
<ClCompile Include="..\Modules\_zstd\compressor.c" />
<ClCompile Include="..\Modules\_zstd\decompressor.c" />
<ClCompile Include="..\Modules\_zstd\zdict.c" />
<ClCompile Include="..\Modules\_zstd\zstddict.c" />
<ClCompile Include="$(zstdDir)common\debug.c" />
<ClCompile Include="$(zstdDir)common\entropy_common.c" />
<ClCompile Include="$(zstdDir)common\error_private.c" />
Expand Down
2 changes: 1 addition & 1 deletion PCbuild/_zstd.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<ClCompile Include="..\Modules\_zstd\decompressor.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_zstd\zdict.c">
<ClCompile Include="..\Modules\_zstd\zstddict.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)common\debug.c">
Expand Down
0