FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-115119: Switch Windows build to mpdecimal external by zware · Pull Request #115182 · python/cpython · GitHub

/ cpython Public

gh-115119: Switch Windows build to mpdecimal external #115182

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
zware merged 5 commits into from
Mar 18, 2024
Conversation 10 Commits 5 Checks 0 Files changed
Merged

gh-115119: Switch Windows build to mpdecimal external #115182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7fc2f57
gh-115119: Switch Windows build to mpdecimal external
zware Feb 8, 2024
0b71ce2
Add mpdecimal.h selection shim
zware Feb 8, 2024
c128618
Define BUILD_LIBMPDEC
zware Feb 25, 2024
7cc95d8
Merge branch 'main' into add_mpdecimal_external
zware Mar 15, 2024
0fce72d
Add mpdecimal to external.spdx.json
zware Mar 15, 2024
File filter

Filter by extension

Filter by extension .bat  (1) .filters  (1) .h  (1) .json  (1) .props  (1) .rst  (1) .vcxproj  (1) All 7 file types selected
Only manifest files
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Windows/2024-02-08-14-48-15.gh-issue-115119.qMt32O.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Switched from vendored ``libmpdecimal`` code to a separately-hosted external
package in the ``cpython-source-deps`` repository when building the
``_decimal`` module.
22 changes: 22 additions & 0 deletions Misc/externals.spdx.json
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,28 @@
"primaryPackagePurpose": "SOURCE",
"versionInfo": "3.4.4"
},
{
"SPDXID": "SPDXRef-PACKAGE-mpdecimal",
"checksums": [
{
"algorithm": "SHA256",
"checksumValue": "93118043651ffa33dcaaab445bae4f8929fca25d2d749079b78e97f220c3d8b1"
}
],
"downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/mpdecimal-2.5.1.tar.gz",
"externalRefs": [
{
"referenceCategory": "SECURITY",
"referenceLocator": "cpe:2.3:a:bytereef:mpdecimal:2.5.1:*:*:*:*:*:*:*",
"referenceType": "cpe23Type"
}
],
"licenseConcluded": "NOASSERTION",
"name": "mpdecimal",
"originator": "Organization: bytereef.org",
"primaryPackagePurpose": "SOURCE",
"versionInfo": "2.5.1"
},
{
"SPDXID": "SPDXRef-PACKAGE-openssl",
"checksums": [
Expand Down
17 changes: 17 additions & 0 deletions Modules/_decimal/windows/mpdecimal.h
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/* Windows mpdecimal.h shim
*
* Generally, the mpdecimal library build will copy the correct header into
* place named "mpdecimal.h", but since we're building it ourselves directly
* into _decimal.pyd, we need to pick the right one.
*
* */

#if defined(_MSC_VER)
#if defined(CONFIG_64)
#include <mpdecimal64vc.h>
#elif defined(CONFIG_32)
#include <mpdecimal32vc.h>
#else
#error "Unknown configuration!"
#endif
#endif
68 changes: 36 additions & 32 deletions PCbuild/_decimal.vcxproj
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -93,51 +93,55 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>BUILD_LIBMPDEC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Platform)' == 'Win32'">CONFIG_32;PPRO;MASM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Platform)'=='ARM'">CONFIG_32;ANSI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Platform)'=='ARM64'">CONFIG_64;ANSI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Platform)' == 'x64'">CONFIG_64;MASM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\windows;$(mpdecimalDir)\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\Modules\_decimal\libmpdec\basearith.h" />
<ClInclude Include="..\Modules\_decimal\libmpdec\bits.h" />
<ClInclude Include="..\Modules\_decimal\libmpdec\constants.h" />
<ClInclude Include="..\Modules\_decimal\libmpdec\convolute.h" />
<ClInclude Include="..\Modules\_decimal\libmpdec\crt.h" />
<ClInclude Include="..\Modules\_decimal\libmpdec\difradix2.h" />
<ClInclude Include="$(mpdecimalDir)\libmpdec\basearith.h" />
Comment thread
zware marked this conversation as resolved.
<ClInclude Include="$(mpdecimalDir)\libmpdec\bits.h" />
<ClInclude Include="$(mpdecimalDir)\libmpdec\constants.h" />
<ClInclude Include="$(mpdecimalDir)\libmpdec\convolute.h" />
<ClInclude Include="$(mpdecimalDir)\libmpdec\crt.h" />
<ClInclude Include="$(mpdecimalDir)\libmpdec\difradix2.h" />
<ClInclude Include="..\Modules\_decimal\docstrings.h" />
<ClInclude Include="..\Modules\_decimal\libmpdec\fnt.h" />
<ClInclude Include="..\Modules\_decimal\libmpdec\fourstep.h" />
<ClInclude Include="..\Modules\_decimal\libmpdec\mpdecimal.h" />
<ClInclude Include="..\Modules\_decimal\libmpdec\numbertheory.h" />
<ClInclude Include="..\Modules\_decimal\libmpdec\sixstep.h" />
<ClInclude Include="..\Modules\_decimal\libmpdec\transpose.h" />
<ClInclude Include="..\Modules\_decimal\libmpdec\typearith.h" />
<ClInclude Include="..\Modules\_decimal\libmpdec\umodarith.h" />
<ClInclude Include="..\Modules\_decimal\libmpdec\vccompat.h" />
<ClInclude Include="$(mpdecimalDir)\libmpdec\fnt.h" />
<ClInclude Include="$(mpdecimalDir)\libmpdec\fourstep.h" />
<ClInclude Include="..\Modules\_decimal\windows\mpdecimal.h" />
<ClInclude Condition="'$(Platform)' == 'Win32'" Include="$(mpdecimalDir)\libmpdec\mpdecimal32vc.h" />
<ClInclude Condition="'$(Platform)' == 'ARM'" Include="$(mpdecimalDir)\libmpdec\mpdecimal32vc.h" />
<ClInclude Condition="'$(Platform)' == 'ARM64'" Include="$(mpdecimalDir)\libmpdec\mpdecimal64vc.h" />
<ClInclude Condition="'$(Platform)' == 'x64'" Include="$(mpdecimalDir)\libmpdec\mpdecimal64vc.h" />
<ClInclude Include="$(mpdecimalDir)\libmpdec\numbertheory.h" />
<ClInclude Include="$(mpdecimalDir)\libmpdec\sixstep.h" />
<ClInclude Include="$(mpdecimalDir)\libmpdec\transpose.h" />
<ClInclude Include="$(mpdecimalDir)\libmpdec\typearith.h" />
<ClInclude Include="$(mpdecimalDir)\libmpdec\umodarith.h" />
<ClInclude Include="$(mpdecimalDir)\libmpdec\vccompat.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Modules\_decimal\_decimal.c" />
<ClCompile Include="..\Modules\_decimal\libmpdec\basearith.c" />
<ClCompile Include="..\Modules\_decimal\libmpdec\constants.c" />
<ClCompile Include="..\Modules\_decimal\libmpdec\context.c" />
<ClCompile Include="..\Modules\_decimal\libmpdec\convolute.c" />
<ClCompile Include="..\Modules\_decimal\libmpdec\crt.c" />
<ClCompile Include="..\Modules\_decimal\libmpdec\difradix2.c" />
<ClCompile Include="..\Modules\_decimal\libmpdec\fnt.c" />
<ClCompile Include="..\Modules\_decimal\libmpdec\fourstep.c" />
<ClCompile Include="..\Modules\_decimal\libmpdec\io.c" />
<ClCompile Include="..\Modules\_decimal\libmpdec\mpalloc.c" />
<ClCompile Include="..\Modules\_decimal\libmpdec\mpdecimal.c" />
<ClCompile Include="..\Modules\_decimal\libmpdec\numbertheory.c" />
<ClCompile Include="..\Modules\_decimal\libmpdec\sixstep.c" />
<ClCompile Include="..\Modules\_decimal\libmpdec\transpose.c" />
<ClCompile Include="$(mpdecimalDir)\libmpdec\basearith.c" />
<ClCompile Include="$(mpdecimalDir)\libmpdec\constants.c" />
<ClCompile Include="$(mpdecimalDir)\libmpdec\context.c" />
<ClCompile Include="$(mpdecimalDir)\libmpdec\convolute.c" />
<ClCompile Include="$(mpdecimalDir)\libmpdec\crt.c" />
<ClCompile Include="$(mpdecimalDir)\libmpdec\difradix2.c" />
<ClCompile Include="$(mpdecimalDir)\libmpdec\fnt.c" />
<ClCompile Include="$(mpdecimalDir)\libmpdec\fourstep.c" />
<ClCompile Include="$(mpdecimalDir)\libmpdec\io.c" />
<ClCompile Include="$(mpdecimalDir)\libmpdec\mpalloc.c" />
<ClCompile Include="$(mpdecimalDir)\libmpdec\mpdecimal.c" />
<ClCompile Include="$(mpdecimalDir)\libmpdec\numbertheory.c" />
<ClCompile Include="$(mpdecimalDir)\libmpdec\sixstep.c" />
<ClCompile Include="$(mpdecimalDir)\libmpdec\transpose.c" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\Modules\_decimal\libmpdec\vcdiv64.asm">
<CustomBuild Include="$(mpdecimalDir)\libmpdec\vcdiv64.asm">
<ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Platform)'=='ARM'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Platform)'=='ARM64'">true</ExcludedFromBuild>
Expand Down
68 changes: 37 additions & 31 deletions PCbuild/_decimal.vcxproj.filters
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -21,96 +21,102 @@
<ClInclude Include="..\Modules\_decimal\docstrings.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\basearith.h">
<ClInclude Include="$(mpdecimalDir)\libmpdec\basearith.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\bits.h">
<ClInclude Include="$(mpdecimalDir)\libmpdec\bits.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\constants.h">
<ClInclude Include="$(mpdecimalDir)\libmpdec\constants.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\convolute.h">
<ClInclude Include="$(mpdecimalDir)\libmpdec\convolute.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\crt.h">
<ClInclude Include="$(mpdecimalDir)\libmpdec\crt.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\difradix2.h">
<ClInclude Include="$(mpdecimalDir)\libmpdec\difradix2.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\fnt.h">
<ClInclude Include="$(mpdecimalDir)\libmpdec\fnt.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\fourstep.h">
<ClInclude Include="$(mpdecimalDir)\libmpdec\fourstep.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\mpdecimal.h">
<ClInclude Include="..\Modules\_decimal\windows\mpdecimal.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\numbertheory.h">
<ClInclude Include="$(mpdecimalDir)\libmpdec\mpdecimal32vc.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\sixstep.h">
<ClInclude Include="$(mpdecimalDir)\libmpdec\mpdecimal64vc.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\transpose.h">
<ClInclude Include="$(mpdecimalDir)\libmpdec\numbertheory.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\typearith.h">
<ClInclude Include="$(mpdecimalDir)\libmpdec\sixstep.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\umodarith.h">
<ClInclude Include="$(mpdecimalDir)\libmpdec\transpose.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\vccompat.h">
<ClInclude Include="$(mpdecimalDir)\libmpdec\typearith.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="$(mpdecimalDir)\libmpdec\umodarith.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="$(mpdecimalDir)\libmpdec\vccompat.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Modules\_decimal\_decimal.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\basearith.c">
<ClCompile Include="$(mpdecimalDir)\libmpdec\basearith.c">
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\constants.c">
<ClCompile Include="$(mpdecimalDir)\libmpdec\constants.c">
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\context.c">
<ClCompile Include="$(mpdecimalDir)\libmpdec\context.c">
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\convolute.c">
<ClCompile Include="$(mpdecimalDir)\libmpdec\convolute.c">
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\crt.c">
<ClCompile Include="$(mpdecimalDir)\libmpdec\crt.c">
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\difradix2.c">
<ClCompile Include="$(mpdecimalDir)\libmpdec\difradix2.c">
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\fnt.c">
<ClCompile Include="$(mpdecimalDir)\libmpdec\fnt.c">
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\fourstep.c">
<ClCompile Include="$(mpdecimalDir)\libmpdec\fourstep.c">
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\io.c">
<ClCompile Include="$(mpdecimalDir)\libmpdec\io.c">
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\mpalloc.c">
<ClCompile Include="$(mpdecimalDir)\libmpdec\mpalloc.c">
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\mpdecimal.c">
<ClCompile Include="$(mpdecimalDir)\libmpdec\mpdecimal.c">
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\numbertheory.c">
<ClCompile Include="$(mpdecimalDir)\libmpdec\numbertheory.c">
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\sixstep.c">
<ClCompile Include="$(mpdecimalDir)\libmpdec\sixstep.c">
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\transpose.c">
<ClCompile Include="$(mpdecimalDir)\libmpdec\transpose.c">
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
</ItemGroup>
Expand All @@ -120,8 +126,8 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\Modules\_decimal\libmpdec\vcdiv64.asm">
<CustomBuild Include="$(mpdecimalDir)\libmpdec\vcdiv64.asm">
<Filter>Source Files\libmpdec</Filter>
</CustomBuild>
</ItemGroup>
</Project>
</Project>
1 change: 1 addition & 0 deletions PCbuild/get_externals.bat
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ set libraries=
set libraries=%libraries% bzip2-1.0.8
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.4
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-3.0.13
set libraries=%libraries% mpdecimal-2.5.1
set libraries=%libraries% sqlite-3.45.1.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.13.1
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.13.1
Expand Down
1 change: 1 addition & 0 deletions PCbuild/python.props
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
<libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir>
<libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
<libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>
<mpdecimalDir Condition="$(mpdecimalDir) == ''">$(ExternalsDir)\mpdecimal-2.5.1\</mpdecimalDir>
<opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.13\</opensslDir>
<opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.13\$(ArchName)\</opensslOutDir>
<opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
Expand Down
Back | FazBrowse Home | New Git URL