traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Anselm Kruis 2018-06-21 16:08:32 +02:00 committed by Zachary Ware
parent f2918881b7
commit 7b383a5714
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PC/VS9.0/build.bat
View File

@ -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
)

2
PC/VS9.0/pyproject.vsprops
View File

@ -82,7 +82,7 @@
/>
<UserMacro
Name="opensslDir"
Value="$(externalsDir)\openssl-1.0.2k"
Value="$(externalsDir)\openssl-1.0.2o"
/>
<UserMacro
Name="tcltkDir"

2
PC/VS9.0/readme.txt
View File

@ -132,7 +132,7 @@ _ssl
Get the source code through
svn export http://svn.python.org/projects/external/openssl-1.0.2k
svn export http://svn.python.org/projects/external/openssl-1.0.2o
** NOTE: if you use the PCbuild\get_externals.bat approach for
obtaining external sources then you don't need to manually get the source