diff options
| author | Steve Dower <steve.dower@python.org> | 2022-04-06 11:56:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-06 11:56:31 +0100 |
| commit | 074da788028c1f1e867dc81698efdcdc263f2288 (patch) | |
| tree | c06fe457e6cd7232a80bdd6b918f4b862a53c199 /PCbuild | |
| parent | 35bcf9f3c19dfbb368c08e3aa75fda72a23c030d (diff) | |
| download | cpython-git-074da788028c1f1e867dc81698efdcdc263f2288.tar.gz | |
bpo-47103: Copy pgort140.dll into output directory when building PGInstrument on Windows (GH-32083)
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/python.vcxproj | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj index 11f835aece..d07db3a681 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -133,9 +133,6 @@ set PYTHONPATH=$(PySourcePath)Lib </Target> <Target Name="GeneratePythonBat" AfterTargets="AfterBuild"> <PropertyGroup> - <_PGOPath Condition="$(Configuration) == 'PGInstrument' and $(Platform) == 'Win32'">@set PATH=%PATH%%3B$(VCInstallDir)bin</_PGOPath> - <_PGOPath Condition="$(Configuration) == 'PGInstrument' and $(Platform) == 'x64'">@set PATH=%PATH%%3B$(VCInstallDir)bin\amd64</_PGOPath> - <_PGOPath Condition="$(Configuration) == 'PGInstrument' and $(VC_PGO_RunTime_Dir) != ''">@set PATH=%PATH%%3B$(VC_PGO_RunTime_Dir)</_PGOPath> <_Content>@rem This script invokes the most recently built Python with all arguments @rem passed through to the interpreter. This file is generated by the @rem build process and any changes *will* be thrown away by the next @@ -145,11 +142,21 @@ set PYTHONPATH=$(PySourcePath)Lib @echo Running $(Configuration)^|$(Platform) interpreter... @setlocal @set PYTHONHOME=$(PySourcePath) -$(_PGOPath) @"$(OutDir)python$(PyDebugExt).exe" %* </_Content> <_ExistingContent Condition="Exists('$(PySourcePath)python.bat')">$([System.IO.File]::ReadAllText('$(PySourcePath)python.bat'))</_ExistingContent> </PropertyGroup> <WriteLinesToFile File="$(PySourcePath)python.bat" Lines="$(_Content)" Overwrite="true" Condition="'$(_Content)' != '$(_ExistingContent)'" /> </Target> + <Target Name="CopyPGORT" AfterTargets="Link" Condition="$(Configuration) == 'PGInstrument'"> + <ItemGroup> + <_PGORT Include="$(VCToolsInstallDir)bin\Hostx86\x86\pgort140.dll" Condition="$(Platform) == 'Win32'" /> + <_PGORT Include="$(VCToolsInstallDir)bin\Hostx64\x64\pgort140.dll" Condition="$(Platform) == 'x64'" /> + <_PGORT Include="$(VCToolsInstallDir)bin\arm64\pgort140.dll" Condition="$(Platform) == 'ARM64'" /> + </ItemGroup> + <Warning Text="Unable to locate pgort140.dll for $(Platform)." Condition="@(_PGORT) == '' or !Exists(@(_PGORT))" /> + <Copy SourceFiles="@(_PGORT)" DestinationFolder="$(OutDir)"> + <Output TaskParameter="CopiedFiles" ItemName="FileWrites" /> + </Copy> + </Target> </Project> |