From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 23 Sep 2022 15:23:41 +0000 (-0700)
Subject: gh-94781: Fix Windows projects not cleaning intermediate and output files for frozen... 
X-Git-Tag: v3.11.1~447
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=512b305856c7d79509bfc42245545b9ec5f5e0c4;p=thirdparty%2FPython%2Fcpython.git

gh-94781: Fix Windows projects not cleaning intermediate and output files for frozen modules (GH-96423)

(cherry picked from commit 3e26de3c1f24bf0810eaaf7d75a4332775870e78)

Co-authored-by: Charlie Zhao <zhaoyu_hit@qq.com>
---

diff --git a/Misc/NEWS.d/next/Windows/2022-08-30-12-01-51.gh-issue-94781.OxO-Gr.rst b/Misc/NEWS.d/next/Windows/2022-08-30-12-01-51.gh-issue-94781.OxO-Gr.rst
new file mode 100644
index 000000000000..d343173d40d6
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2022-08-30-12-01-51.gh-issue-94781.OxO-Gr.rst
@@ -0,0 +1,2 @@
+Fix :file:`pcbuild.proj` to clean previous instances of ouput files in ``Python\deepfreeze`` and
+``Python\frozen_modules`` directories on Windows. Patch by Charlie Zhao.
diff --git a/PCbuild/_freeze_module.vcxproj b/PCbuild/_freeze_module.vcxproj
index 0a74f5850a1e..442e3437dac9 100644
--- a/PCbuild/_freeze_module.vcxproj
+++ b/PCbuild/_freeze_module.vcxproj
@@ -424,6 +424,10 @@
   <Target Name="_CleanFrozen" BeforeTargets="CoreClean" Condition="$(Configuration) != 'PGUpdate'">
     <ItemGroup>
       <Clean Include="%(None.IntFile)" />
+      <Clean Include="%(None.OutFile)" />
+      <Clean Include="%(GetPath.IntFile)" />
+      <Clean Include="%(GetPath.OutFile)" />
+      <Clean Include="$(PySourcePath)Python\deepfreeze\deepfreeze.c" />
     </ItemGroup>
   </Target>
 </Project>
diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj
index 2ba0627b8336..222821adb1d7 100644
--- a/PCbuild/pcbuild.proj
+++ b/PCbuild/pcbuild.proj
@@ -125,6 +125,12 @@
              StopOnFirstFailure="false"
              Condition="%(CleanTarget) != ''"
              Targets="%(CleanTarget)" />
+    <MSBuild Projects="@(FreezeProjects)"
+            Properties="Configuration=%(Configuration);Platform=%(Platform);%(Properties)"
+            BuildInParallel="%(BuildInParallel)"
+            StopOnFirstFailure="false"
+            Condition="%(CleanTarget) != ''"
+            Targets="%(CleanTarget)" />
   </Target>
 
   <Target Name="CleanAll">
@@ -140,6 +146,12 @@
              StopOnFirstFailure="false"
              Condition="%(CleanAllTarget) != ''"
              Targets="%(CleanAllTarget)" />
+    <MSBuild Projects="@(FreezeProjects)"
+            Properties="Configuration=%(Configuration);Platform=%(Platform);%(Properties)"
+            BuildInParallel="%(BuildInParallel)"
+            StopOnFirstFailure="false"
+            Condition="%(CleanTarget) != ''"
+            Targets="%(CleanTarget)" />
   </Target>
 
   <Target Name="Rebuild" DependsOnTargets="Clean;Build" />