diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-12-10 20:16:46 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-10 20:16:46 -0800 |
| commit | d1fb21209bca0620ece849e05cca97bce861c996 (patch) | |
| tree | 9d92905ea73d101cc759556975e6cd9968d10439 /PCbuild | |
| parent | 0e4ad88ff8956d9289ab0a1314636ac15b374459 (diff) | |
| download | cpython-git-d1fb21209bca0620ece849e05cca97bce861c996.tar.gz | |
bpo-35401: Update Windows build to OpenSSL 1.1.0j (GH-11088)
(cherry picked from commit 4824385fec0a1de99b4183f995a3e4923771bf64)
Co-authored-by: Steve Dower <steve.dower@microsoft.com>
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/get_externals.bat | 4 | ||||
| -rw-r--r-- | PCbuild/prepare_ssl.bat | 9 | ||||
| -rw-r--r-- | PCbuild/python.props | 4 |
3 files changed, 4 insertions, 13 deletions
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 9d4faee5f7..7a8de1e761 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -49,7 +49,7 @@ echo.Fetching external libraries... set libraries= set libraries=%libraries% bzip2-1.0.6 -if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.0i +if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.0j set libraries=%libraries% sqlite-3.21.0.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.8.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.8.0 @@ -72,7 +72,7 @@ for %%e in (%libraries%) do ( echo.Fetching external binaries... set binaries= -if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.0i +if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.0j if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.8.0 if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06 diff --git a/PCbuild/prepare_ssl.bat b/PCbuild/prepare_ssl.bat index bfdac54044..bd4b548528 100644 --- a/PCbuild/prepare_ssl.bat +++ b/PCbuild/prepare_ssl.bat @@ -23,8 +23,6 @@ setlocal if "%PCBUILD%"=="" (set PCBUILD=%~dp0) if "%EXTERNALS_DIR%"=="" (set EXTERNALS_DIR=%PCBUILD%\..\externals) -set OUT= -set SRC= set ORG_SETTING= :CheckOpts @@ -32,19 +30,12 @@ if "%~1"=="-h" shift & goto Usage if "%~1"=="--certificate" (set SigningCertificate=%~2) && shift && shift & goto CheckOpts if "%~1"=="-c" (set SigningCertificate=%~2) && shift && shift & goto CheckOpts if "%~1"=="--organization" (set ORG_SETTING=--organization "%~2") && shift && shift && goto CheckOpts -if "%~1"=="-i" (SET SRC=$~2) && shift && shift && goto CheckOpts -if "%~1"=="--in" (SET SRC=$~2) && shift && shift && goto CheckOpts -if "%~1"=="-o" (set OUT=$~2) && shift && shift && goto CheckOpts -if "%~1"=="--out" (set OUT=$~2) && shift && shift && goto CheckOpts if "%~1"=="" goto Build echo Unrecognized option: %1 goto Usage :Build -if not defined SRC (echo --in directory is required & exit /b 1) -if not defined OUT (echo --out directory is required & exit /b 1) - call "%PCBUILD%\find_msbuild.bat" %MSBUILD% if ERRORLEVEL 1 (echo Cannot locate MSBuild.exe on PATH or as MSBUILD variable & exit /b 2) diff --git a/PCbuild/python.props b/PCbuild/python.props index f474e6f07e..f83d4df0d5 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -49,8 +49,8 @@ <sqlite3Dir>$(ExternalsDir)sqlite-3.21.0.0\</sqlite3Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir> - <opensslDir>$(ExternalsDir)openssl-1.1.0i\</opensslDir> - <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.0i\$(ArchName)\</opensslOutDir> + <opensslDir>$(ExternalsDir)openssl-1.1.0j\</opensslDir> + <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.0j\$(ArchName)\</opensslOutDir> <opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> <zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir> |