mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-08 02:32:49 +08:00
[python3] Update to v3.7.3
This commit is contained in:
parent
dfef7b1116
commit
121faf2ee2
@ -1,39 +0,0 @@
|
|||||||
--- a/PCbuild/pythoncore.vcxproj
|
|
||||||
+++ b/PCbuild/pythoncore.vcxproj
|
|
||||||
@@ -41,7 +41,7 @@
|
|
||||||
<Import Project="python.props" />
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Label="Configuration">
|
|
||||||
- <ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
||||||
+ <ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseOfMfc>false</UseOfMfc>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
@@ -67,13 +67,25 @@
|
|
||||||
<ClCompile>
|
|
||||||
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<AdditionalIncludeDirectories>$(PySourcePath)Python;$(PySourcePath)Modules\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
- <PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
+ <PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_NO_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<AdditionalDependencies>version.lib;shlwapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(PySourcePath)PC\external\$(PlatformToolset)\$(ArchName)</AdditionalLibraryDirectories>
|
|
||||||
<BaseAddress>0x1e000000</BaseAddress>
|
|
||||||
</Link>
|
|
||||||
+ <Lib>
|
|
||||||
+ <TargetMachine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MachineX86</TargetMachine>
|
|
||||||
+ </Lib>
|
|
||||||
+ <Lib>
|
|
||||||
+ <TargetMachine Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">MachineX86</TargetMachine>
|
|
||||||
+ </Lib>
|
|
||||||
+ <Lib>
|
|
||||||
+ <TargetMachine Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">MachineX86</TargetMachine>
|
|
||||||
+ </Lib>
|
|
||||||
+ <Lib>
|
|
||||||
+ <TargetMachine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MachineX86</TargetMachine>
|
|
||||||
+ </Lib>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="..\Include\abstract.h" />
|
|
||||||
--
|
|
@ -1,15 +0,0 @@
|
|||||||
--- a/PCbuild/pythoncore.vcxproj
|
|
||||||
+++ b/PCbuild/pythoncore.vcxproj
|
|
||||||
@@ -68,6 +68,10 @@
|
|
||||||
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<AdditionalIncludeDirectories>$(PySourcePath)Python;$(PySourcePath)Modules\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_NO_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
+ <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MultiThreadedDebug</RuntimeLibrary>
|
|
||||||
+ <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MultiThreadedDebug</RuntimeLibrary>
|
|
||||||
+ <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MultiThreaded</RuntimeLibrary>
|
|
||||||
+ <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MultiThreaded</RuntimeLibrary>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<AdditionalDependencies>version.lib;shlwapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
--
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
|||||||
diff --git a/PC/pyconfig.h b/PC/pyconfig.h
|
|
||||||
index 64e7aec..aa36745 100644
|
|
||||||
--- a/PC/pyconfig.h
|
|
||||||
+++ b/PC/pyconfig.h
|
|
||||||
@@ -274,6 +274,7 @@ typedef int pid_t;
|
|
||||||
|
|
||||||
/* For Windows the Python core is in a DLL by default. Test
|
|
||||||
Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */
|
|
||||||
+#define Py_NO_ENABLE_SHARED
|
|
||||||
#if !defined(MS_NO_COREDLL) && !defined(Py_NO_ENABLE_SHARED)
|
|
||||||
# define Py_ENABLE_SHARED 1 /* standard symbol for shared library */
|
|
||||||
# define MS_COREDLL /* deprecated old symbol */
|
|
||||||
--
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
|||||||
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c
|
|
||||||
--- a/Modules/_io/_iomodule.c
|
|
||||||
+++ b/Modules/_io/_iomodule.c
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
#endif /* HAVE_SYS_STAT_H */
|
|
||||||
|
|
||||||
#ifdef MS_WINDOWS
|
|
||||||
-#include <consoleapi.h>
|
|
||||||
+#include <windows.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Various interned strings */
|
|
@ -1,12 +0,0 @@
|
|||||||
diff --git a/PCbuild/python.props b/PCbuild/python.props
|
|
||||||
--- a/PCbuild/python.props
|
|
||||||
+++ b/PCbuild/python.props
|
|
||||||
@@ -76,7 +76,7 @@
|
|
||||||
-->
|
|
||||||
<_RegistryVersion>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</_RegistryVersion>
|
|
||||||
<_RegistryVersion Condition="$(_RegistryVersion) == ''">$(Registry:HKEY_LOCAL_MACHINE\WOW6432Node\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</_RegistryVersion>
|
|
||||||
- <DefaultWindowsSDKVersion>10.0.15063.0</DefaultWindowsSDKVersion>
|
|
||||||
+ <DefaultWindowsSDKVersion Condition="$(_RegistryVersion) == '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion>
|
|
||||||
<DefaultWindowsSDKVersion Condition="$(_RegistryVersion) == '10.0.14393'">10.0.14393.0</DefaultWindowsSDKVersion>
|
|
||||||
<DefaultWindowsSDKVersion Condition="$(_RegistryVersion) == '10.0.10586'">10.0.10586.0</DefaultWindowsSDKVersion>
|
|
||||||
<DefaultWindowsSDKVersion Condition="$(_RegistryVersion) == '10.0.10240'">10.0.10240.0</DefaultWindowsSDKVersion>
|
|
@ -1,3 +1,3 @@
|
|||||||
Source: python3
|
Source: python3
|
||||||
Version: 3.6.4-5
|
Version: 3.7.3
|
||||||
Description: The Python programming language as an embeddable library
|
Description: The Python programming language as an embeddable library
|
@ -1,13 +0,0 @@
|
|||||||
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
|
|
||||||
index 0f01852..6e63711 100644
|
|
||||||
--- a/PCbuild/pythoncore.vcxproj
|
|
||||||
+++ b/PCbuild/pythoncore.vcxproj
|
|
||||||
@@ -71,7 +71,7 @@
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<AdditionalDependencies>version.lib;shlwapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(PySourcePath)PC\external\$(PlatformToolset)\$(ArchName)</AdditionalLibraryDirectories>
|
|
||||||
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(PySourcePath)PC\external\v140\$(ArchName)</AdditionalLibraryDirectories>
|
|
||||||
<BaseAddress>0x1e000000</BaseAddress>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
@ -1,17 +0,0 @@
|
|||||||
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
|
|
||||||
index 9a096bc..0647cf8 100644
|
|
||||||
--- a/PCbuild/pyproject.props
|
|
||||||
+++ b/PCbuild/pyproject.props
|
|
||||||
@@ -94,9 +94,9 @@
|
|
||||||
Inputs="$(PySourcePath)Include\patchlevel.h"
|
|
||||||
Outputs="$(IntDir)pythonnt_rc.h">
|
|
||||||
<WriteLinesToFile File="$(IntDir)pythonnt_rc.h" Overwrite="true" Encoding="ascii"
|
|
||||||
- Lines='/* This file created by pyproject.props /t:GeneratePythonNtRcH */
|
|
||||||
-#define FIELD3 $(Field3Value)
|
|
||||||
-#define MS_DLL_ID "$(SysWinVer)"
|
|
||||||
+ Lines='/* This file created by pyproject.props /t:GeneratePythonNtRcH */;
|
|
||||||
+#define FIELD3 $(Field3Value);
|
|
||||||
+#define MS_DLL_ID "$(SysWinVer)";
|
|
||||||
#define PYTHON_DLL_NAME "$(TargetName)$(TargetExt)"
|
|
||||||
' />
|
|
||||||
<ItemGroup>
|
|
@ -4,8 +4,8 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic AND VCPKG_CRT_LINKAGE STREQUAL static
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(PYTHON_VERSION_MAJOR 3)
|
set(PYTHON_VERSION_MAJOR 3)
|
||||||
set(PYTHON_VERSION_MINOR 6)
|
set(PYTHON_VERSION_MINOR 7)
|
||||||
set(PYTHON_VERSION_PATCH 4)
|
set(PYTHON_VERSION_PATCH 3)
|
||||||
set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH})
|
set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH})
|
||||||
|
|
||||||
include(vcpkg_common_functions)
|
include(vcpkg_common_functions)
|
||||||
@ -14,13 +14,8 @@ vcpkg_from_github(
|
|||||||
OUT_SOURCE_PATH TEMP_SOURCE_PATH
|
OUT_SOURCE_PATH TEMP_SOURCE_PATH
|
||||||
REPO python/cpython
|
REPO python/cpython
|
||||||
REF v${PYTHON_VERSION}
|
REF v${PYTHON_VERSION}
|
||||||
SHA512 32cca5e344ee66f08712ab5533e5518f724f978ec98d985f7612d0bd8d7f5cac25625363c9eead192faf1806d4ea3393515f72ba962a2a0bed26261e56d8c637
|
SHA512 023960a2f570fe7178d3901df0c3c33346466906b6d55c73ef7947c19619dbab62efc42c7262a0539bc5e31543b1113eb7a088d4615ad7557a0707bdaca27940
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES
|
|
||||||
${CMAKE_CURRENT_LIST_DIR}/0004-Fix-iomodule-for-RS4-SDK.patch
|
|
||||||
${CMAKE_CURRENT_LIST_DIR}/0005-Fix-DefaultWindowsSDKVersion.patch
|
|
||||||
dev16.patch
|
|
||||||
Microsoft.VisualStudio.Setup.Configuration.Native.patch
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# We need per-triplet directories because we need to patch the project files differently based on the linkage
|
# We need per-triplet directories because we need to patch the project files differently based on the linkage
|
||||||
@ -29,21 +24,6 @@ set(SOURCE_PATH "${TEMP_SOURCE_PATH}-Lib-${VCPKG_LIBRARY_LINKAGE}-crt-${VCPKG_CR
|
|||||||
file(REMOVE_RECURSE ${SOURCE_PATH})
|
file(REMOVE_RECURSE ${SOURCE_PATH})
|
||||||
file(RENAME "${TEMP_SOURCE_PATH}" ${SOURCE_PATH})
|
file(RENAME "${TEMP_SOURCE_PATH}" ${SOURCE_PATH})
|
||||||
|
|
||||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
|
||||||
vcpkg_apply_patches(
|
|
||||||
SOURCE_PATH ${SOURCE_PATH}
|
|
||||||
PATCHES
|
|
||||||
${CMAKE_CURRENT_LIST_DIR}/0001-Static-library.patch
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
if (VCPKG_CRT_LINKAGE STREQUAL static)
|
|
||||||
vcpkg_apply_patches(
|
|
||||||
SOURCE_PATH ${SOURCE_PATH}
|
|
||||||
PATCHES
|
|
||||||
${CMAKE_CURRENT_LIST_DIR}/0002-Static-CRT.patch
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
|
if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
|
||||||
set(BUILD_ARCH "Win32")
|
set(BUILD_ARCH "Win32")
|
||||||
set(OUT_DIR "win32")
|
set(OUT_DIR "win32")
|
||||||
@ -58,14 +38,6 @@ vcpkg_build_msbuild(
|
|||||||
PROJECT_PATH ${SOURCE_PATH}/PCBuild/pythoncore.vcxproj
|
PROJECT_PATH ${SOURCE_PATH}/PCBuild/pythoncore.vcxproj
|
||||||
PLATFORM ${BUILD_ARCH})
|
PLATFORM ${BUILD_ARCH})
|
||||||
|
|
||||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
|
||||||
vcpkg_apply_patches(
|
|
||||||
SOURCE_PATH ${SOURCE_PATH}
|
|
||||||
PATCHES
|
|
||||||
${CMAKE_CURRENT_LIST_DIR}/0003-Fix-header-for-static-linkage.patch
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
file(GLOB HEADERS ${SOURCE_PATH}/Include/*.h)
|
file(GLOB HEADERS ${SOURCE_PATH}/Include/*.h)
|
||||||
file(COPY ${HEADERS} ${SOURCE_PATH}/PC/pyconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
|
file(COPY ${HEADERS} ${SOURCE_PATH}/PC/pyconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user