gh-133779: Revert Windows generation of pyconfig.h and go back to a s… · python/cpython@986c367

GitHub

@@ -102,6 +102,7 @@

102102 <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>

103103 <AdditionalIncludeDirectories>$(PySourcePath)Modules\_hacl;$(PySourcePath)Modules\_hacl\include;$(PySourcePath)Python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

104104 <AdditionalIncludeDirectoriesCondition="$(IncludeExternals)">$(zlibNgDir);$(GeneratedZlibNgDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

105+ <AdditionalIncludeDirectoriesCondition="'$(UseJIT)' == 'true'">$(GeneratedJitStencilsDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

105106 <PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_BUILD_CORE_BUILTIN;Py_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";ZLIB_COMPAT;%(PreprocessorDefinitions)</PreprocessorDefinitions>

106107 <PreprocessorDefinitionsCondition="$(IncludeExternals)">_Py_HAVE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

107108 <PreprocessorDefinitionsCondition="'$(UseJIT)' == 'true'">_Py_JIT;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -409,7 +410,7 @@

409410 <ClIncludeInclude="..\Parser\string_parser.h" />

410411 <ClIncludeInclude="..\Parser\pegen.h" />

411412 <ClIncludeInclude="..\PC\errmap.h" />

412- <ClIncludeInclude="..\PC\pyconfig.h.in" />

413+ <ClIncludeInclude="..\PC\pyconfig.h" />

413414 <ClIncludeInclude="..\Python\condvar.h" />

414415 <ClIncludeInclude="..\Python\stdlib_module_names.h" />

415416 <ClIncludeInclude="..\Python\thread_nt.h" />

@@ -688,34 +689,6 @@

688689 </ImportGroup>

689690 <TargetName="_TriggerRegen"BeforeTargets="PrepareForBuild"DependsOnTargets="Regen" />

690691691- <TargetName="_UpdatePyconfig"BeforeTargets="PrepareForBuild">

692- <MakeDirDirectories="$(IntDir)"Condition="!Exists($(IntDir))" />

693- <ItemGroup>

694- <PyConfigHRemove="@(PyConfigH)" />

695- <PyConfigHInclude="@(ClInclude)"Condition="'%(Filename)%(Extension)' == 'pyconfig.h.in'" />

696- </ItemGroup>

697- <ErrorText="Did not find pyconfig.h"Condition="@(ClInclude) == ''" />

698- <PropertyGroup>

699- <PyConfigH>@(PyConfigH->'%(FullPath)', ';')</PyConfigH>

700- <PyConfigHText>$([System.IO.File]::ReadAllText($(PyConfigH)))</PyConfigHText>

701- <OldPyConfigHCondition="Exists('$(IntDir)pyconfig.h')">$([System.IO.File]::ReadAllText('$(IntDir)pyconfig.h'))</OldPyConfigH>

702- </PropertyGroup>

703- <PropertyGroupCondition="$(DisableGil) == 'true'">

704- <PyConfigHText>$(PyConfigHText.Replace('/* #define Py_GIL_DISABLED 1 */', '#define Py_GIL_DISABLED 1'))</PyConfigHText>

705- </PropertyGroup>

706- <MessageText="Updating pyconfig.h"Condition="$(PyConfigHText.TrimEnd()) != $(OldPyConfigH.TrimEnd())" />

707- <WriteLinesToFileFile="$(IntDir)pyconfig.h"

708-Lines="$(PyConfigHText)"

709-Overwrite="true"

710-Condition="$(PyConfigHText.TrimEnd()) != $(OldPyConfigH.TrimEnd())" />

711- </Target>

712- <TargetName="_CopyPyconfig"Inputs="$(IntDir)pyconfig.h"Outputs="$(OutDir)pyconfig.h"AfterTargets="Build"DependsOnTargets="_UpdatePyconfig">

713- <CopySourceFiles="$(IntDir)pyconfig.h"DestinationFolder="$(OutDir)" />

714- </Target>

715- <TargetName="_CleanPyconfig"AfterTargets="Clean">

716- <DeleteFiles="$(IntDir)pyconfig.h;$(OutDir)pyconfig.h" />

717- </Target>

718-719692 <TargetName="_GetBuildInfo"BeforeTargets="PrepareForBuild">

720693 <PropertyGroup>

721694 <GITCondition="$(GIT) == ''">git</GIT>