diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-04-03 22:20:12 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-03 22:20:12 (GMT) |
| commit | e6685ad05385f8cb492e8e1c7c07889a94517f55 (patch) | |
| tree | 54eb3a434e2e2db86cef348b8b4b4364311fb5cc /PC | |
| parent | e6783981df6ae5c63f73be67cc41b1350bc0fcc6 (diff) | |
| download | cpython-e6685ad05385f8cb492e8e1c7c07889a94517f55.zip cpython-e6685ad05385f8cb492e8e1c7c07889a94517f55.tar.gz cpython-e6685ad05385f8cb492e8e1c7c07889a94517f55.tar.bz2 | |
bpo-40158: Fix CPython MSBuild Properties in NuGet Package (GH-19343)
Fix default Python home path relative to the NuGet package
(cherry picked from commit 6e623ff9d251e0ce86e9b18a01bfd6f067079d7a)
Co-authored-by: Chris Martinez <sydefekt@hotmail.com>
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/layout/support/props.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/PC/layout/support/props.py b/PC/layout/support/props.py index b1560b5..1eb9b7c 100644 --- a/PC/layout/support/props.py +++ b/PC/layout/support/props.py @@ -29,8 +29,7 @@ PROPS_DATA["PYTHON_TARGET"] = "_GetPythonRuntimeFilesDependsOn{}{}_{}".format( PROPS_TEMPLATE = r"""<?xml version="1.0" encoding="utf-8"?> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Condition="$(Platform) == '{PYTHON_PLATFORM}'"> - <PythonHome Condition="$(Configuration) == 'Debug'">$([msbuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), "python_d.exe")</PythonHome> - <PythonHome Condition="$(PythonHome) == ''">$([msbuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), "python.exe")</PythonHome> + <PythonHome Condition="$(PythonHome) == ''">$([System.IO.Path]::GetFullPath("$(MSBuildThisFileDirectory)\..\..\tools"))</PythonHome> <PythonInclude>$(PythonHome)\include</PythonInclude> <PythonLibs>$(PythonHome)\libs</PythonLibs> <PythonTag>{PYTHON_TAG}</PythonTag> |