Skip to content

Commit c98a5be

Browse files
emmax86emmax86
committed
Explicitly label release distributions of OpenSSL as such
1 parent 44ae2b7 commit c98a5be

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

‎utils/acquireOpenSSL.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const getCompilerVersion = () => {
4141
const getIsDebug = () => false // TODO: Determine if we are GYPing in Debug
4242

4343
const getMatchingDistributionName = () =>
44-
`${getOSName()}-${getCompilerVersion()}-static${getIsDebug() ? '-debug' : ''}`;
44+
`${getOSName()}-${getCompilerVersion()}-static${getIsDebug() ? '-debug' : '-release'}`;
4545

4646
const getDistributionsConfig = () =>
4747
fse.readFile(distrosFilePath, 'utf8')

‎utils/discoverOpenSSLDistros.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,56 +74,56 @@ const debugPairs = R.toPairs({
7474
})
7575

7676
const releasePairs = R.toPairs({
77-
'win32-vs12-static': R.allPass([
77+
'win32-vs12-static-release': R.allPass([
7878
...windowsCommonConditions,
7979
R.test(/^\s*arch=x86$/gm),
8080
R.test(/^\s*build_type=Release$/gm),
8181
R.test(/^\s*compiler\.runtime=MT$/gm),
8282
R.test(/^\s*compiler\.version=12$/gm)
8383
]),
84-
'win32-vs14-static': R.allPass([
84+
'win32-vs14-static-release': R.allPass([
8585
...windowsCommonConditions,
8686
R.test(/^\s*arch=x86$/gm),
8787
R.test(/^\s*build_type=Release$/gm),
8888
R.test(/^\s*compiler\.runtime=MT$/gm),
8989
R.test(/^\s*compiler\.version=14$/gm)
9090
]),
91-
'win32-vs15-static': R.allPass([
91+
'win32-vs15-static-release': R.allPass([
9292
...windowsCommonConditions,
9393
R.test(/^\s*arch=x86$/gm),
9494
R.test(/^\s*build_type=Release$/gm),
9595
R.test(/^\s*compiler\.runtime=MT$/gm),
9696
R.test(/^\s*compiler\.version=15$/gm)
9797
]),
9898

99-
'win64-vs12-static': R.allPass([
99+
'win64-vs12-static-release': R.allPass([
100100
...windowsCommonConditions,
101101
R.test(/^\s*arch=x86_64$/gm),
102102
R.test(/^\s*build_type=Release$/gm),
103103
R.test(/^\s*compiler\.runtime=MT$/gm),
104104
R.test(/^\s*compiler\.version=12$/gm)
105105
]),
106-
'win64-vs14-static': R.allPass([
106+
'win64-vs14-static-release': R.allPass([
107107
...windowsCommonConditions,
108108
R.test(/^\s*arch=x86_64$/gm),
109109
R.test(/^\s*build_type=Release$/gm),
110110
R.test(/^\s*compiler\.runtime=MT$/gm),
111111
R.test(/^\s*compiler\.version=14$/gm)
112112
]),
113-
'win64-vs15-static': R.allPass([
113+
'win64-vs15-static-release': R.allPass([
114114
...windowsCommonConditions,
115115
R.test(/^\s*arch=x86_64$/gm),
116116
R.test(/^\s*build_type=Release$/gm),
117117
R.test(/^\s*compiler\.runtime=MT$/gm),
118118
R.test(/^\s*compiler\.version=15$/gm)
119119
]),
120120

121-
'macOS-clang-9-static': R.allPass([
121+
'macOS-clang-9-static-release': R.allPass([
122122
...macCommonConditions,
123123
R.test(/^\s*build_type=Release$/gm),
124124
R.test(/^\s*compiler\.version=9.0$/gm)
125125
]),
126-
'macOS-clang-8.1-static': R.allPass([
126+
'macOS-clang-8.1-static-release': R.allPass([
127127
...macCommonConditions,
128128
R.test(/^\s*build_type=Release$/gm),
129129
R.test(/^\s*compiler\.version=8\.1$/gm)

‎vendor/openssl_distributions.json‎

Lines changed: 9 additions & 9 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",
32
"macOS-clang-8.1-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/bd3cca94af79c6a2c35b664c43f643582a13a9f2/conan_package.tgz",
4-
"macOS-clang-9-static": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/227fb0ea22f4797212e72ba94ea89c7b3fbc2a0c/conan_package.tgz",
3+
"macOS-clang-8.1-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/0197c20e330042c026560da838f5b4c4bf094b8a/conan_package.tgz",
54
"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/d16d8a16b4cef0046922b8d83d567689d36149d0/conan_package.tgz",
5+
"macOS-clang-9-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/227fb0ea22f4797212e72ba94ea89c7b3fbc2a0c/conan_package.tgz",
76
"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",
7+
"win32-vs12-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/d16d8a16b4cef0046922b8d83d567689d36149d0/conan_package.tgz",
98
"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",
9+
"win32-vs14-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/253958a6ce15f1c9325eeea33ffc0a5cfc29212a/conan_package.tgz",
1110
"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",
11+
"win32-vs15-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/a075e3ffc3590d6a920a26b4218b20253dd68d57/conan_package.tgz",
1312
"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",
13+
"win64-vs12-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/e942631065059eabe964ca471ad35bb453c15b31/conan_package.tgz",
1514
"win64-vs14-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/867ca54360ed234a8bc9a6aa63806599ea29b38e/conan_package.tgz",
16-
"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/0bd0c413b56aaec57c0f222a89b4e565a6729027/conan_package.tgz"
15+
"win64-vs14-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/c4aef4edbc33205e0cf9b55bfb116b38c90ec132/conan_package.tgz",
16+
"win64-vs15-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/0bd0c413b56aaec57c0f222a89b4e565a6729027/conan_package.tgz",
17+
"win64-vs15-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/fce9be1511a149a4af36b5997f7e611ab83b2f58/conan_package.tgz"
1818
}

0 commit comments

Comments
 (0)