Skip to content

Commit 4d262fe

Browse files
emmax86emmax86
committed
Fixup misdiscovered OpenSSL distros
1 parent 90bb388 commit 4d262fe

File tree

2 files changed

+25
-13
lines changed

2 files changed

+25
-13
lines changed

‎utils/discoverOpenSSLDistros.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,37 +21,43 @@ const debugPairs = R.toPairs({
2121
...windowsCommonConditions,
2222
R.test(/arch=x86$/gm),
2323
R.test(/build_type=Debug$/gm),
24+
R.test(/compiler\.runtime=MTd$/gm),
2425
R.test(/compiler\.version=12$/gm)
2526
]),
2627
'win32-vs14-static-debug': R.allPass([
2728
...windowsCommonConditions,
2829
R.test(/arch=x86$/gm),
2930
R.test(/build_type=Debug$/gm),
31+
R.test(/compiler\.runtime=MTd$/gm),
3032
R.test(/compiler\.version=14$/gm)
3133
]),
3234
'win32-vs15-static-debug': R.allPass([
3335
...windowsCommonConditions,
3436
R.test(/arch=x86$/gm),
3537
R.test(/build_type=Debug$/gm),
38+
R.test(/compiler\.runtime=MTd$/gm),
3639
R.test(/compiler\.version=15$/gm)
3740
]),
3841

3942
'win64-vs12-static-debug': R.allPass([
4043
...windowsCommonConditions,
4144
R.test(/arch=x86_64$/gm),
4245
R.test(/build_type=Debug$/gm),
46+
R.test(/compiler\.runtime=MTd$/gm),
4347
R.test(/compiler\.version=12$/gm)
4448
]),
4549
'win64-vs14-static-debug': R.allPass([
4650
...windowsCommonConditions,
4751
R.test(/arch=x86_64$/gm),
4852
R.test(/build_type=Debug$/gm),
53+
R.test(/compiler\.runtime=MTd$/gm),
4954
R.test(/compiler\.version=14$/gm)
5055
]),
5156
'win64-vs15-static-debug': R.allPass([
5257
...windowsCommonConditions,
5358
R.test(/arch=x86_64$/gm),
5459
R.test(/build_type=Debug$/gm),
60+
R.test(/compiler\.runtime=MTd$/gm),
5561
R.test(/compiler\.version=15$/gm)
5662
]),
5763

@@ -72,37 +78,43 @@ const releasePairs = R.toPairs({
7278
...windowsCommonConditions,
7379
R.test(/arch=x86$/gm),
7480
R.test(/build_type=Release$/gm),
81+
R.test(/compiler\.runtime=MT$/gm),
7582
R.test(/compiler\.version=12$/gm)
7683
]),
7784
'win32-vs14-static': R.allPass([
7885
...windowsCommonConditions,
7986
R.test(/arch=x86$/gm),
8087
R.test(/build_type=Release$/gm),
88+
R.test(/compiler\.runtime=MT$/gm),
8189
R.test(/compiler\.version=14$/gm)
8290
]),
8391
'win32-vs15-static': R.allPass([
8492
...windowsCommonConditions,
8593
R.test(/arch=x86$/gm),
8694
R.test(/build_type=Release$/gm),
95+
R.test(/compiler\.runtime=MT$/gm),
8796
R.test(/compiler\.version=15$/gm)
8897
]),
8998

9099
'win64-vs12-static': R.allPass([
91100
...windowsCommonConditions,
92101
R.test(/arch=x86_64$/gm),
93102
R.test(/build_type=Release$/gm),
103+
R.test(/compiler\.runtime=MT$/gm),
94104
R.test(/compiler\.version=12$/gm)
95105
]),
96106
'win64-vs14-static': R.allPass([
97107
...windowsCommonConditions,
98108
R.test(/arch=x86_64$/gm),
99109
R.test(/build_type=Release$/gm),
110+
R.test(/compiler\.runtime=MT$/gm),
100111
R.test(/compiler\.version=14$/gm)
101112
]),
102113
'win64-vs15-static': R.allPass([
103114
...windowsCommonConditions,
104115
R.test(/arch=x86_64$/gm),
105116
R.test(/build_type=Release$/gm),
117+
R.test(/compiler\.runtime=MT$/gm),
106118
R.test(/compiler\.version=15$/gm)
107119
]),
108120

‎vendor/openssl_distributions.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
2-
"macOS-clang-8.1-static": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/0197c20e330042c026560da838f5b4c4bf094b8a/conan_package.tgz",
2+
"macOS-clang-8.1-static": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/4dc21962ebc63953d4b0879c71588b3b46212e03/conan_package.tgz",
33
"macOS-clang-8.1-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/bb3dedf958bed17c8b7de4ab616b14d054cab175/conan_package.tgz",
44
"macOS-clang-9-static": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/5e9b4170b1252b259e07e6ebd53940386a1c30e6/conan_package.tgz",
5-
"macOS-clang-9-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/85d674b0f6705cafe6b2edb8689ffbe0f3c2e60b/conan_package.tgz",
6-
"win32-vs12-static": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/6f2f3b0c15b05f704ad0dc3e210856b9e1d5f124/conan_package.tgz",
7-
"win32-vs12-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/858921f173c8aa3417cb27e8b770b641b094189b/conan_package.tgz",
8-
"win32-vs14-static": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/5d34366328ff5fe8b9f93b912e5855ffb5fda596/conan_package.tgz",
9-
"win32-vs14-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/905af0349b2753e6dc59539d1317f5af5de9dba9/conan_package.tgz",
10-
"win32-vs15-static": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/5cdf9cf71704a68709a24a99f186895542f6f4eb/conan_package.tgz",
11-
"win32-vs15-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/7fe3cc08c1d5b184e2bb601c5eb20e22e19d3b12/conan_package.tgz",
12-
"win64-vs12-static": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/ab5f7fed94c4531f685e70b9eab51ad99653de33/conan_package.tgz",
13-
"win64-vs12-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/1fbed831a364d4b0ce63ad1d20a4c6b324f20910/conan_package.tgz",
14-
"win64-vs14-static": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/ee5dab950b6ea94ae953b93c55343e98c2ec39df/conan_package.tgz",
15-
"win64-vs14-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/d46f21ed153d8d3f2effc93e2164f121efb5a4f3/conan_package.tgz",
5+
"macOS-clang-9-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/ab7e33d40e9aa675c552b4a9be0cc5bb204a4eb5/conan_package.tgz",
6+
"win32-vs12-static": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/d16d8a16b4cef0046922b8d83d567689d36149d0/conan_package.tgz",
7+
"win32-vs12-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/39d6fe009a278f733e97b59a4f9536bfc4e8f366/conan_package.tgz",
8+
"win32-vs14-static": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/253958a6ce15f1c9325eeea33ffc0a5cfc29212a/conan_package.tgz",
9+
"win32-vs14-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/889fd4ea9ba89fd6dc7fa32e2f45bd9804b85481/conan_package.tgz",
10+
"win32-vs15-static": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/a075e3ffc3590d6a920a26b4218b20253dd68d57/conan_package.tgz",
11+
"win32-vs15-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/05f648ec4d066b206769d6314e859fdd97a18f8d/conan_package.tgz",
12+
"win64-vs12-static": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/e942631065059eabe964ca471ad35bb453c15b31/conan_package.tgz",
13+
"win64-vs12-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/6bc3be0f39fdc624b24ba9bb00e8af55928d74e7/conan_package.tgz",
14+
"win64-vs14-static": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/c4aef4edbc33205e0cf9b55bfb116b38c90ec132/conan_package.tgz",
15+
"win64-vs14-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/867ca54360ed234a8bc9a6aa63806599ea29b38e/conan_package.tgz",
1616
"win64-vs15-static": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/fce9be1511a149a4af36b5997f7e611ab83b2f58/conan_package.tgz",
17-
"win64-vs15-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/009a50ddeb47afbc9361cbc63650560c127e1234/conan_package.tgz"
17+
"win64-vs15-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/0bd0c413b56aaec57c0f222a89b4e565a6729027/conan_package.tgz"
1818
}

0 commit comments

Comments
 (0)