diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-09-06 17:01:38 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 17:01:38 (GMT) |
| commit | 5fcd5e64eec9ed67613b8fe7356fb8288151ceba (patch) | |
| tree | 7f439fe482a133d7877977a255d518a5ee846024 /PCbuild/pyproject.props | |
| parent | bcaac8188b1a1e67d2cc155609f0f883f036df33 (diff) | |
| download | cpython-5fcd5e64eec9ed67613b8fe7356fb8288151ceba.zip cpython-5fcd5e64eec9ed67613b8fe7356fb8288151ceba.tar.gz cpython-5fcd5e64eec9ed67613b8fe7356fb8288151ceba.tar.bz2 | |
bpo-31340: Change to building with MSVC v141 (included with Visual Studio 2017) (#3311)
Diffstat (limited to 'PCbuild/pyproject.props')
| -rw-r--r-- | PCbuild/pyproject.props | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index 6ab9b65..aed8f34 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -147,8 +147,24 @@ foreach (System.Diagnostics.Process p in System.Diagnostics.Process.GetProcesses Targets="CleanAll" /> </Target> + <Target Name="CopyPGCFiles" BeforeTargets="PrepareForBuild" Condition="$(Configuration) == 'PGUpdate'"> + <ItemGroup> + <_PGCFiles Include="$(OutDir)instrumented\$(TargetName)!*.pgc" /> + <_PGDFile Include="$(OutDir)instrumented\$(TargetName).pgd" /> + <_CopyFiles Include="@(_PGCFiles);@(_PGDFile)" Condition="Exists(%(FullPath))" /> + </ItemGroup> + <Delete Files="@(_CopyFiles->'$(OutDir)%(Filename)%(Extension)')" /> + <Error Text="PGO run did not succeed (no $(TargetName)!*.pgc files) and there is no data to merge" + Condition="$(RequirePGCFiles) == 'true' and @(_PGCFiles) == ''" /> + <Copy SourceFiles="@(_CopyFiles)" + DestinationFolder="$(OutDir)" + UseHardLinksIfPossible="true" + OverwriteReadOnlyFiles="true" /> + </Target> + <PropertyGroup> - <SdkBinPath Condition="'$(SdkBinPath)' == '' or !Exists($(SdkBinPath))">$(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot10)\bin\x86</SdkBinPath> + <SdkBinPath Condition="'$(SdkBinPath)' == '' or !Exists($(SdkBinPath))">$(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot10)\bin\$(DefaultWindowsSDKVersion)\x86</SdkBinPath> + <SdkBinPath Condition="!Exists($(SdkBinPath))">$(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot10)\bin\x86</SdkBinPath> <SdkBinPath Condition="!Exists($(SdkBinPath))">$(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot81)\bin\x86</SdkBinPath> <SdkBinPath Condition="!Exists($(SdkBinPath))">$(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot)\bin\x86</SdkBinPath> <SdkBinPath Condition="!Exists($(SdkBinPath))">$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A@InstallationFolder)\Bin\</SdkBinPath> |