bpo-31392: Update SSL build for 1.1.0 (#3448) · python/cpython@b84bcc4 (original) (raw)
`@@ -47,52 +47,68 @@
`
47
47
` 64
`
48
48
` x86
`
49
49
` amd64
`
``
50
`+
VC-WIN32
`
``
51
`+
VC-WIN64A
`
50
52
` true
`
51
53
`
`
52
54
``
53
``
`-
`
54
``
`-
`
55
``
`-
`
56
``
`-
`
57
``
-
58
55
`
`
59
56
`
`
60
57
``
61
58
`
`
62
59
` $(opensslDir)\tmp$(Bitness)dll
`
63
``
`-
$(opensslDir)\out$(Bitness)dll
`
64
``
`-
ms\ntdll$(Bitness).mak
`
65
``
`` -
LIB_D="$(opensslOutDir.TrimEnd(\))" OUT_D=out$(Bitness)dll TMP_D=tmp$(Bitness)dll INC_D=inc$(Bitness) INCO_D=inc$(Bitness)\openssl
``
``
60
`+
$(opensslOutDir)
`
66
61
` setlocal
`
67
``
`-
set PATH=%PATH%;$(nasmDir);@(Perl->'%(RootDir)%(Directory)',';')
`
68
62
`set VCINSTALLDIR=$(VCInstallDir)
`
69
``
`` -
cd /D "$(opensslDir.TrimEnd(\))"
``
70
63
`if not exist "$(IntDir.TrimEnd(''))" mkdir "$(IntDir.TrimEnd(''))"
`
71
``
`-
if not exist "$(OutDir.TrimEnd(''))" mkdir "$(OutDir.TrimEnd(''))"
`
72
``
`` -
if not exist "$(opensslOutDir.TrimEnd(\))" mkdir "$(opensslOutDir.TrimEnd(\))"
``
73
``
`` -
(PYTHON)"@(PrepareSSL−>′(PYTHON) "@(PrepareSSL->'%(FullPath)')" "(PYTHON)"@(PrepareSSL−>′(opensslDir.TrimEnd(\))" $(ArchName)
``
74
``
`-
nmake -f (MakeFile)(MakeFile) (MakeFile)(NMakeOptions) headers lib
`
75
``
`-
copy /y LICENSE "$(opensslOutDir)\LICENSE"
`
``
64
`+
cd /D "$(IntDir.TrimEnd(''))"
`
``
65
`+ (Perl)"(Perl) "(Perl)"(opensslDir)\configure" $(OpenSSLPlatform) no-asm
`
``
66
`+
nmake
`
76
67
`
`
77
68
`
`
78
69
``
79
70
`
`
80
71
``
81
``
`-
`
82
``
`-
`
``
72
`+
`
``
73
`+
`
``
74
`+
$(opensslDir)\ms\uplink.c
`
``
75
`+
((h = GetModuleHandle(NULL)) == NULL)
`
``
76
`+
((h = GetModuleHandleA("_ssl.pyd")) == NULL) if ((h = GetModuleHandleA("_ssl_d.pyd")) == NULL) if ((h = GetModuleHandle(NULL)) == NULL /patched/)
`
``
77
`+
`
``
78
`+
<Error Text="Cannot find (Uplink)"Condition="!Exists((Uplink)" Condition="!Exists((Uplink)"Condition="!Exists((Uplink))" />
`
``
79
`+
`
``
80
`+
<_Original>$([System.IO.File]::ReadAllText($(Uplink)))</_Original>
`
``
81
`+
<_Patched>$(_Original.Replace($(BeforePatch), $(AfterPatch)))</_Patched>
`
``
82
`+
false
`
``
83
`+
true
`
``
84
`+
`
``
85
`+
`
``
86
`+
<Message Text="Patching (Uplink)"Importance="high"Condition="!(Uplink)" Importance="high" Condition="!(Uplink)"Importance="high"Condition="!(IsPatched)" />
`
``
87
`+
<WriteLinesToFile File="$(Uplink)"
`
``
88
`+
Lines="$(_Patched)"
`
``
89
`+
Overwrite="true"
`
``
90
`+
Encoding="ASCII"
`
``
91
`+
Condition="!$(IsPatched)" />
`
83
92
`
`
84
93
``
85
``
`-
`
``
94
`+
`
86
95
`
`
87
``
`-
`
88
``
`-
`
``
96
`+
<_Built Include="$(opensslDir)\LICENSE" />
`
``
97
`+
<_Built Include="$(IntDir)\libcrypto.lib;$(IntDir)\libcrypto-*.dll;$(IntDir)\libcrypto-*.pdb" />
`
``
98
`+
<_Built Include="$(IntDir)\libssl.lib;$(IntDir)\libssl-*.dll;$(IntDir)\libssl-*.pdb" />
`
``
99
`+
<_AppLink Include="$(opensslDir)\ms\applink.c" />
`
``
100
`+
<_Include Include="$(opensslDir)\Include\openssl*.h" />
`
``
101
`+
<_Include Include="$(IntDir)\include\openssl*.h" />
`
89
102
`
`
90
``
`-
`
``
103
`+
`
``
104
`+
`
``
105
`+
`
``
106
`+
`
91
107
`
`
92
108
``
93
109
`
`
94
110
`
`
95
``
`-
`
``
111
`+
`
96
112
`
`
97
113
`
`
98
114
`
`