bpo-33931: Fix building using PC\VS9.0\build.bat -e (GH-7844)

Set the openssl version to 1.0.2o and fix compiling Tcl.

diff --git a/PC/VS9.0/build.bat b/PC/VS9.0/build.bat
index 2c846a54fed150e8d854596e49e27f529b3d919e..0729ec7b2bb306275007534030af17a3a6904bde 100644 (file)
--- a/PC/VS9.0/build.bat
+++ b/PC/VS9.0/build.bat
@@ -76,9 +76,10 @@ if '%build_tkinter%'=='true' (
 )
 if '%build_tkinter%'=='true' (
     if not exist "%tcltkdir%\bin\tcl85%tcl_dbg_ext%.dll" (
-        @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install
+        @rem clean, all and install need to be separate invocations, otherwise nmakehlp is not found on install
         pushd "%tcldir%\win"
-        nmake -f makefile.vc MACHINE=%machine% DEBUG=%debug_flag% INSTALLDIR="%tcltkdir%" clean all
+        nmake -f makefile.vc MACHINE=%machine% DEBUG=%debug_flag% INSTALLDIR="%tcltkdir%" clean
+        nmake -f makefile.vc MACHINE=%machine% DEBUG=%debug_flag% INSTALLDIR="%tcltkdir%" all
         nmake -f makefile.vc MACHINE=%machine% DEBUG=%debug_flag% INSTALLDIR="%tcltkdir%" install
         popd
     )

diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
index d4ced7bbf68f1ce07ba1f27ac7b8cdbcce7d1505..ef28af8c1ed503ecef76e23b8123c62f3a460ba2 100644 (file)
--- a/PC/VS9.0/pyproject.vsprops
+++ b/PC/VS9.0/pyproject.vsprops
@@ -82,7 +82,7 @@
        />
        <UserMacro
                Name="opensslDir"
-               Value="$(externalsDir)\openssl-1.0.2k"
+               Value="$(externalsDir)\openssl-1.0.2o"
        />
        <UserMacro
                Name="tcltkDir"

diff --git a/PC/VS9.0/readme.txt b/PC/VS9.0/readme.txt
index 55dda781d1278b79cd8af4eefce217958812da34..a4024d57dd51c0889366b1ddcf02c25e928d2083 100644 (file)
--- a/PC/VS9.0/readme.txt
+++ b/PC/VS9.0/readme.txt
@@ -132,7 +132,7 @@ _ssl
 \r
     Get the source code through\r
 \r
-    svn export http://svn.python.org/projects/external/openssl-1.0.2k\r
+    svn export http://svn.python.org/projects/external/openssl-1.0.2o\r
 \r
     ** NOTE: if you use the PCbuild\get_externals.bat approach for\r
     obtaining external sources then you don't need to manually get the source\r