Fix zlib-ng generator and MSI paths

Author: zooba

PCbuild/zlib-ng.vcxproj

@@ -219,13 +219,15 @@
     <PropertyGroup>
       <Text>$([System.IO.File]::ReadAllText('$(zlibNgDir)\zlib.h.in').Replace('@ZLIB_SYMBOL_PREFIX@', ''))</Text>
     </PropertyGroup>
-    <WriteLinesToFile File="$(IntDir)zlib.h" Lines="$(Text)" />
+    <MakeDir Directories="$(GeneratedZlibNgDir)" />
+    <WriteLinesToFile File="$(GeneratedZlibNgDir)zlib.h" Lines="$(Text)" />
   </Target>
   <Target Name="_EnsureZlibNgH" Inputs="$(zlibNgDir)\zlib-ng.h.in" Outputs="$(IntDir)zlib-ng.h">
     <PropertyGroup>
       <Text>$([System.IO.File]::ReadAllText('$(zlibNgDir)\zlib-ng.h.in').Replace('@ZLIB_SYMBOL_PREFIX@', ''))</Text>
     </PropertyGroup>
-    <WriteLinesToFile File="$(IntDir)zlib-ng.h" Lines="$(Text)" />
+    <MakeDir Directories="$(GeneratedZlibNgDir)" />
+    <WriteLinesToFile File="$(GeneratedZlibNgDir)zlib-ng.h" Lines="$(Text)" />
   </Target>
 
   <Target Name="_EnsureZlibNgHeaders" BeforeTargets="PrepareForBuild"

Tools/msi/freethreaded/freethreaded_files.wxs

@@ -61,11 +61,15 @@
             <Component Id="freethreaded_python_dll.pdb" Directory="InstallDirectory" Guid="*">
                 <File Name="python$(var.MajorVersionNumber)$(var.MinorVersionNumber)t.pdb" Source="!(bindpath.build_t)\python$(var.MajorVersionNumber)$(var.MinorVersionNumber)t.pdb" KeyPath="yes" />
             </Component>
+            <!--
+            Renaming the PDB like this will break automatic connection by debuggers,
+            but short of making people stop using this installer there's no real option.
+            -->
             <Component Id="freethreaded_python.pdb" Directory="InstallDirectory" Guid="*">
-                <File Name="python$(var.ShortVersion)t.pdb" Source="!(bindpath.build_t)\python$(var.ShortVersion)t.pdb" />
+                <File Name="python$(var.ShortVersion)t.pdb" Source="!(bindpath.build_t)\python.pdb" />
             </Component>
             <Component Id="freethreaded_pythonw.pdb" Directory="InstallDirectory" Guid="*">
-                <File Name="pythonw$(var.ShortVersion)t.pdb" Source="!(bindpath.build_t)\pythonw$(var.ShortVersion)t.pdb" />
+                <File Name="pythonw$(var.ShortVersion)t.pdb" Source="!(bindpath.build_t)\pythonw.pdb" />
             </Component>
         </ComponentGroup>
     </Fragment>