diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-09-09 13:13:06 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-09 13:13:06 (GMT) |
| commit | b84bcc48ae31c385fe480c08c05d95212ef7fcdc (patch) | |
| tree | e05a3904af68a4e2149e4152b52ee2aacd46436b /Tools/msi | |
| parent | efb1d0a3c001a6153211063ba439b9847aa03509 (diff) | |
| download | cpython-b84bcc48ae31c385fe480c08c05d95212ef7fcdc.zip cpython-b84bcc48ae31c385fe480c08c05d95212ef7fcdc.tar.gz cpython-b84bcc48ae31c385fe480c08c05d95212ef7fcdc.tar.bz2 | |
bpo-31392: Update SSL build for 1.1.0 (#3448)
Diffstat (limited to 'Tools/msi')
| -rw-r--r-- | Tools/msi/lib/lib_files.wxs | 16 | ||||
| -rw-r--r-- | Tools/msi/make_zip.py | 2 | ||||
| -rw-r--r-- | Tools/msi/msi.props | 4 |
3 files changed, 10 insertions, 12 deletions
diff --git a/Tools/msi/lib/lib_files.wxs b/Tools/msi/lib/lib_files.wxs index 0b8a3ee..fa0da3a 100644 --- a/Tools/msi/lib/lib_files.wxs +++ b/Tools/msi/lib/lib_files.wxs @@ -14,11 +14,11 @@ <Component Id="sqlite3.dll" Directory="DLLs" Guid="*"> <File Name="sqlite3.dll" KeyPath="yes" /> </Component> - <Component Id="libeay32.dll" Directory="DLLs" Guid="*"> - <File Name="libeay32.dll" KeyPath="yes" /> + <Component Id="libcrypto.dll" Directory="DLLs" Guid="*"> + <File Name="libcrypto$(var.ssltag).dll" KeyPath="yes" /> </Component> - <Component Id="ssleay32.dll" Directory="DLLs" Guid="*"> - <File Name="ssleay32.dll" KeyPath="yes" /> + <Component Id="libssl.dll" Directory="DLLs" Guid="*"> + <File Name="libssl$(var.ssltag).dll" KeyPath="yes" /> </Component> </ComponentGroup> </Fragment> @@ -36,11 +36,11 @@ <Component Id="sqlite3.pdb" Directory="DLLs" Guid="*"> <File Name="sqlite3.pdb" /> </Component> - <Component Id="libeay32.pdb" Directory="DLLs" Guid="*"> - <File Name="libeay32.pdb" KeyPath="yes" /> + <Component Id="libcrypto.pdb" Directory="DLLs" Guid="*"> + <File Name="libcrypto$(var.ssltag).pdb" KeyPath="yes" /> </Component> - <Component Id="ssleay32.pdb" Directory="DLLs" Guid="*"> - <File Name="ssleay32.pdb" KeyPath="yes" /> + <Component Id="libssl.pdb" Directory="DLLs" Guid="*"> + <File Name="libssl$(var.ssltag).pdb" KeyPath="yes" /> </Component> </ComponentGroup> </Fragment> diff --git a/Tools/msi/make_zip.py b/Tools/msi/make_zip.py index 8e35bdc..58f3b15 100644 --- a/Tools/msi/make_zip.py +++ b/Tools/msi/make_zip.py @@ -47,8 +47,6 @@ EXCLUDE_FILE_FROM_LIBRARY = { EXCLUDE_FILE_FROM_LIBS = { 'liblzma', - 'ssleay', - 'libeay', 'python3stub', } diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props index 60abba1..2318d48 100644 --- a/Tools/msi/msi.props +++ b/Tools/msi/msi.props @@ -92,10 +92,10 @@ $(DefineConstants);CRTRedist=$(CRTRedist); </DefineConstants> <DefineConstants Condition="$(Platform) != 'x64'"> - $(DefineConstants);Suffix32=-32; + $(DefineConstants);Suffix32=-32;ssltag=-1_1; </DefineConstants> <DefineConstants Condition="$(Platform) == 'x64'"> - $(DefineConstants);Suffix32=; + $(DefineConstants);Suffix32=;ssltag=-1_1-x64; </DefineConstants> </PropertyGroup> |