From bd970bc8308d6d5aeb51cbcfde173b118e824351 Mon Sep 17 00:00:00 2001 From: Segev Finer Date: Tue, 6 Jun 2017 01:55:15 +0300 Subject: [PATCH 1/7] Silence liblzma warnings in MSVC --- PCbuild/liblzma.vcxproj | 1 + 1 file changed, 1 insertion(+) diff --git a/PCbuild/liblzma.vcxproj b/PCbuild/liblzma.vcxproj index 711f9bd64ff2d99..4ace9d945f48d8f 100644 --- a/PCbuild/liblzma.vcxproj +++ b/PCbuild/liblzma.vcxproj @@ -64,6 +64,7 @@ ProgramDatabase Disabled $(lzmaDir)windows;$(lzmaDir)src/liblzma/common;$(lzmaDir)src/common;$(lzmaDir)src/liblzma/api;$(lzmaDir)src/liblzma/check;$(lzmaDir)src/liblzma/delta;$(lzmaDir)src/liblzma/lz;$(lzmaDir)src/liblzma/lzma;$(lzmaDir)src/liblzma/rangecoder;$(lzmaDir)src/liblzma/simple + 4028;4113;4244;4267;4996 From a678c74843b9deabc6a5a4401f209e467c41cf83 Mon Sep 17 00:00:00 2001 From: Segev Finer Date: Tue, 6 Jun 2017 02:25:54 +0300 Subject: [PATCH 2/7] Silence socketmodule.c warnings in MSVC --- PCbuild/_socket.vcxproj | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PCbuild/_socket.vcxproj b/PCbuild/_socket.vcxproj index d5c4d1b5b6f5d99..8231f4528660f1a 100644 --- a/PCbuild/_socket.vcxproj +++ b/PCbuild/_socket.vcxproj @@ -60,6 +60,9 @@ <_ProjectFileVersion>10.0.30319.1 + + _WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + ws2_32.lib;%(AdditionalDependencies) 0x1e1D0000 @@ -83,4 +86,4 @@ - \ No newline at end of file + From 3bd1035ca3389dbcfa0054d4678cfe5a9790ecf0 Mon Sep 17 00:00:00 2001 From: Segev Finer Date: Tue, 6 Jun 2017 02:26:21 +0300 Subject: [PATCH 3/7] Silence OpenSSL warnings in MSVC --- PCbuild/openssl.props | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props index 0de4e43410db0ca..11c6ece0e981378 100644 --- a/PCbuild/openssl.props +++ b/PCbuild/openssl.props @@ -3,7 +3,7 @@ $(opensslDir)tmp\ - + @@ -16,6 +16,7 @@ + @@ -43,11 +44,11 @@ - + <_PreprocessorDefinitionList>@(PreprocessorDefinitions) - + @@ -56,7 +57,7 @@ $(_PreprocessorDefinitionList);%(PreprocessorDefinitions) - + nasm.exe -f win32 From 3575d2731593db795aefcb114cb684e8c3f204a5 Mon Sep 17 00:00:00 2001 From: Segev Finer Date: Tue, 6 Jun 2017 02:37:42 +0300 Subject: [PATCH 4/7] Fix tix warnings in MSVC --- PCbuild/tix.vcxproj | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/PCbuild/tix.vcxproj b/PCbuild/tix.vcxproj index d1bc0aba3024beb..0e3e1eb3621acb8 100644 --- a/PCbuild/tix.vcxproj +++ b/PCbuild/tix.vcxproj @@ -42,23 +42,24 @@ - + Makefile $(tcltkDir) $(tixDLLPath) - + - + - + BUILDDIRTOP="$(BuildDirTop)" TCL_DIR="$(tclDir.TrimEnd(`\`))" TK_DIR="$(tkDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))" DEBUG=1 NODEBUG=0 TCL_DBGX=g TK_DBGX=g DEBUG=0 NODEBUG=1 + -c -W3 -nologo -MD -wd4028 -wd4090 setlocal @(ExpectedOutputs->'if not exist "%(FullPath)" goto build',' ') @@ -66,11 +67,11 @@ goto :eof :build set VCINSTALLDIR=$(VCInstallDir) cd /D "$(tixDir)win" -nmake /nologo -f makefile.vc MACHINE=$(TclMachine) $(DebugFlags) $(TclShortVersions) $(TixDirs) all install +nmake /nologo -f makefile.vc MACHINE=$(TclMachine) cflags="$(CFlags)" $(DebugFlags) $(TclShortVersions) $(TixDirs) all install rmdir /q/s "$(OutDir.TrimEnd(`\`))" - + {b5fd6f1d-129e-4bff-9340-03606fac7283} @@ -89,6 +90,6 @@ nmake /nologo -f makefile.vc MACHINE=$(TclMachine) $(DebugFlags) $(TclShortVersi - + - \ No newline at end of file + From e61f333b82afbff1d6f3bf6c1486374e15fde102 Mon Sep 17 00:00:00 2001 From: Segev Finer Date: Tue, 6 Jun 2017 02:45:07 +0300 Subject: [PATCH 5/7] Fix validateUcrtbase failing due to missing _ctypes --- PCbuild/pcbuild.sln | 3 +++ 1 file changed, 3 insertions(+) diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln index 4848e2bc63832df..0c15323732ef56b 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -9,6 +9,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "python.vcxproj", "{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}" + ProjectSection(ProjectDependencies) = postProject + {0E9791DB-593A-465F-98BC-681011311618} = {0E9791DB-593A-465F-98BC-681011311618} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore.vcxproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}" EndProject From 0330a2df9e01403e37d42b8c632d1657e21c7326 Mon Sep 17 00:00:00 2001 From: Segev Finer Date: Tue, 6 Jun 2017 02:54:40 +0300 Subject: [PATCH 6/7] Undo random whitespace differences due to editor --- PCbuild/_socket.vcxproj | 2 +- PCbuild/openssl.props | 8 ++++---- PCbuild/tix.vcxproj | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/PCbuild/_socket.vcxproj b/PCbuild/_socket.vcxproj index 8231f4528660f1a..caf32bf58225e8a 100644 --- a/PCbuild/_socket.vcxproj +++ b/PCbuild/_socket.vcxproj @@ -86,4 +86,4 @@ - + \ No newline at end of file diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props index 11c6ece0e981378..0fc8adc9702ddff 100644 --- a/PCbuild/openssl.props +++ b/PCbuild/openssl.props @@ -3,7 +3,7 @@ $(opensslDir)tmp\ - + @@ -44,11 +44,11 @@ - + <_PreprocessorDefinitionList>@(PreprocessorDefinitions) - + @@ -57,7 +57,7 @@ $(_PreprocessorDefinitionList);%(PreprocessorDefinitions) - + nasm.exe -f win32 diff --git a/PCbuild/tix.vcxproj b/PCbuild/tix.vcxproj index 0e3e1eb3621acb8..7d6d8ca8a65cb91 100644 --- a/PCbuild/tix.vcxproj +++ b/PCbuild/tix.vcxproj @@ -42,19 +42,19 @@ - + Makefile $(tcltkDir) $(tixDLLPath) - + - + - + BUILDDIRTOP="$(BuildDirTop)" TCL_DIR="$(tclDir.TrimEnd(`\`))" TK_DIR="$(tkDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))" DEBUG=1 NODEBUG=0 TCL_DBGX=g TK_DBGX=g @@ -71,7 +71,7 @@ nmake /nologo -f makefile.vc MACHINE=$(TclMachine) cflags="$(CFlags)" $(DebugFla rmdir /q/s "$(OutDir.TrimEnd(`\`))" - + {b5fd6f1d-129e-4bff-9340-03606fac7283} @@ -90,6 +90,6 @@ nmake /nologo -f makefile.vc MACHINE=$(TclMachine) cflags="$(CFlags)" $(DebugFla - + - + \ No newline at end of file From 220bc5fef167a048cb5e3ee0b70528333c03b107 Mon Sep 17 00:00:00 2001 From: Segev Finer Date: Tue, 13 Jun 2017 16:57:39 +0300 Subject: [PATCH 7/7] bpo-30631: Removed _WINSOCK_DEPRECATED_NO_WARNINGS from _socket.vcxproj --- PCbuild/_socket.vcxproj | 3 --- 1 file changed, 3 deletions(-) diff --git a/PCbuild/_socket.vcxproj b/PCbuild/_socket.vcxproj index caf32bf58225e8a..d5c4d1b5b6f5d99 100644 --- a/PCbuild/_socket.vcxproj +++ b/PCbuild/_socket.vcxproj @@ -60,9 +60,6 @@ <_ProjectFileVersion>10.0.30319.1 - - _WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - ws2_32.lib;%(AdditionalDependencies) 0x1e1D0000