Issue #22919: Windows build updated to support VC 14.0 (Visual Studio 2015), which will be used for the official 3.5 release.

4 files changed, 89 insertions, 19 deletions

diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat
index d37ec7b..83a5dfd 100644
--- a/Tools/buildbot/build.bat
+++ b/Tools/buildbot/build.bat
@@ -1,7 +1,10 @@
 @rem Used by the buildbot "compile" step.
 
 @rem Clean up
-call "%~dp0clean.bat"
+set PLAT=
+if '%1' EQU '-p' if '%2' EQU 'x64' (set PLAT=-amd64)
+
+call "%~dp0clean%PLAT%.bat"
 
 @rem If you need the buildbots to start fresh (such as when upgrading to
 @rem a new version of an external library, especially Tcl/Tk):
@@ -14,4 +17,4 @@ call "%~dp0clean.bat"
 @rem 4) re-comment, commit and push again
 
 @rem Do the build
-call "%~dp0..\..\PCbuild\build.bat" -e -d %*
+call "%~dp0..\..\PCbuild\build.bat" -e -d -v %*
diff --git a/Tools/buildbot/buildmsi.bat b/Tools/buildbot/buildmsi.bat
index f414c22..fc12273 100644
--- a/Tools/buildbot/buildmsi.bat
+++ b/Tools/buildbot/buildmsi.bat
@@ -2,6 +2,7 @@
 setlocal
 
 set cwd=%CD%
+
 @rem build release versions of things
 call "%~dp0build.bat" -c Release
 
@@ -9,7 +10,7 @@ call "%~dp0build.bat" -c Release
 call "%~dp0..\..\Doc\make.bat" htmlhelp
 
 @rem build the MSI file
-call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" x86
+call "%~dp0..\..\PCBuild\env.bat" x86
 cd "%~dp0..\..\PC"
 nmake /f icons.mak
 cd ..\Tools\msi
diff --git a/Tools/buildbot/clean.bat b/Tools/buildbot/clean.bat
index f4643a8..39fec01 100644
--- a/Tools/buildbot/clean.bat
+++ b/Tools/buildbot/clean.bat
@@ -5,29 +5,25 @@ setlocal
 set root=%~dp0..\..
 set pcbuild=%root%\PCbuild
 
-echo.Attempting to kill Pythons...
-for %%k in (kill_python.exe
-            kill_python_d.exe
-            amd64\kill_python.exe
-            amd64\kill_python_d.exe
-            ) do (
-    if exist "%pcbuild%\%%k" (
-        echo.Calling %pcbuild%\%%k...
-        "%pcbuild%\%%k"
-    )
-)
 if "%1" == "x64" (
     set vcvars_target=x86_amd64
-    set platform_target=x64
+    set platform=x64
 ) else (
     set vcvars_target=x86
-    set platform_target=x86
+    set platform=Win32
 )
-call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" %vcvars_target%
+
+call "%pcbuild%\env.bat" %vcvars_target%
+
+echo.Attempting to kill Pythons...
+msbuild /v:m /nologo /target:KillPython "%pcbuild%\pythoncore.vcxproj" /p:Configuration=Release /p:Platform=%platform%
+
 echo Deleting .pyc/.pyo files ...
 del /s "%root%\Lib\*.pyc" "%root%\Lib\*.pyo"
+
 echo Deleting test leftovers ...
 rmdir /s /q "%root%\build"
 
-msbuild /target:clean "%pcbuild%\pcbuild.sln" /p:Configuration=Release /p:PlatformTarget=%platform_target%
-msbuild /target:clean "%pcbuild%\pcbuild.sln" /p:Configuration=Debug /p:PlatformTarget=%platform_target%
+echo Deleting build
+msbuild /v:m /nologo /target:clean "%pcbuild%\pcbuild.proj" /p:Configuration=Release /p:Platform=%platform%
+msbuild /v:m /nologo /target:clean "%pcbuild%\pcbuild.proj" /p:Configuration=Debug /p:Platform=%platform%
diff --git a/Tools/ssl/sslspeed.vcxproj b/Tools/ssl/sslspeed.vcxproj
new file mode 100644
index 0000000..8ec4106
--- /dev/null
+++ b/Tools/ssl/sslspeed.vcxproj
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{F068BCCF-C0D6-478D-A2C5-26BA3237C992}</ProjectGuid>
+    <RootNamespace>sslspeed</RootNamespace>
+  </PropertyGroup>
+  
+  <Import Project="..\..\PCBuild\python.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="..\..\PCBuild\openssl.props" />
+  
+  <PropertyGroup Label="Configuration">
+    <OriginalOutDir>$(OutDir)</OriginalOutDir>
+    <OutDir>$(MSBuildProjectDirectory)\$(ArchName)\</OutDir>
+    <IntDir>$(MSBuildProjectDirectory)\$(ArchName)\obj\</IntDir>
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  
+  <ItemGroup>
+    <ClCompile Include="$(opensslDir)apps\speed.c" />
+    <ClCompile Include="$(opensslDir)apps\apps.c" />
+  </ItemGroup>
+  
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(opensslIncDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;crypt32.lib;libeay$(PyDebugExt).lib;ssleay$(PyDebugExt).lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OriginalOutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\PCBuild\ssleay.vcxproj">
+      <Project>{10615b24-73bf-4efa-93aa-236916321317}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\PCBuild\libeay.vcxproj">
+      <Project>{e5b04cc0-eb4c-42ab-b4dc-18ef95f864b0}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
\ No newline at end of file