diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-10-31 12:17:11 -0700 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-10-31 12:17:11 -0700 |
| commit | 940f6a8f11b5ef0f9fa85b0be4b95608efebb2e8 (patch) | |
| tree | a75f4cc54fd92dac49b0e9a127d956f7f4e41a3b /PCbuild/python.props | |
| parent | f97edf1aa630d507a69885e5a3e9ff8edbe3ea02 (diff) | |
| download | cpython-git-940f6a8f11b5ef0f9fa85b0be4b95608efebb2e8.tar.gz | |
Improves handling of test markers for building Python without intefering with actual installs.
Diffstat (limited to 'PCbuild/python.props')
| -rw-r--r-- | PCbuild/python.props | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/PCbuild/python.props b/PCbuild/python.props index 25d6d92010..862f04103c 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -41,6 +41,12 @@ <!-- Suffix for all binaries when building for debug --> <PyDebugExt Condition="'$(PyDebugExt)' == '' and $(Configuration) == 'Debug'">_d</PyDebugExt> + <!-- Suffix for versions/keys when building with test markers --> + <PyTestExt Condition="$(UseTestMarker) == 'true'">-test</PyTestExt> + + <!-- Suffix for versions/keys when building for particular platforms --> + <PyArchExt Condition="'$(ArchName)' == 'win32'">-32</PyArchExt> + <!-- Full path of the resulting python.exe binary --> <PythonExe Condition="'$(PythonExe)' == ''">$(BuildPath)python$(PyDebugExt).exe</PythonExe> </PropertyGroup> @@ -129,17 +135,17 @@ $([msbuild]::Multiply($(MicroVersionNumber), 1000)) )) ))</Field3Value> + <Field3Value Condition="$(UseTestMarker) == 'true'">$([msbuild]::Add($(Field3Value), 9000))</Field3Value> <!-- The name of the resulting pythonXY.dll (without the extension) --> <PyDllName>python$(MajorVersionNumber)$(MinorVersionNumber)$(PyDebugExt)</PyDllName> <!-- The version and platform tag to include in .pyd filenames --> - <PydTag Condition="$(Platform) == 'Win32' or $(Platform) == 'x86'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win32</PydTag> - <PydTag Condition="$(Platform) == 'x64'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win_amd64</PydTag> + <PydTag Condition="$(ArchName) == 'win32'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win32</PydTag> + <PydTag Condition="$(ArchName) == 'amd64'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win_amd64</PydTag> <!-- The version number for sys.winver --> - <SysWinVer>$(MajorVersionNumber).$(MinorVersionNumber)</SysWinVer> - <SysWinVer Condition="$(Platform) == 'Win32' or $(Platform) == 'x86'">$(SysWinVer)-32</SysWinVer> + <SysWinVer>$(MajorVersionNumber).$(MinorVersionNumber)$(PyArchExt)$(PyTestExt)</SysWinVer> </PropertyGroup> <!-- Displays the calculated version info --> @@ -148,5 +154,7 @@ <Message Importance="high" Text="PythonVersion: $(PythonVersion)" /> <Message Importance="high" Text="PythonVersionHex: 0x$([System.UInt32]::Parse($(PythonVersionHex)).ToString(`X08`))" /> <Message Importance="high" Text="Field3Value: $(Field3Value)" /> + <Message Importance="high" Text="SysWinVer: $(SysWinVer)" /> + <Message Importance="high" Text="PyDllName: $(PyDllName)" /> </Target> </Project> |