Skip to content

Commit 0f1ad0e

Browse files
emmax86emmax86
committed
Fixed shipping wrong Mac OpenSSL distros 🙈
1 parent 136dace commit 0f1ad0e

File tree

3 files changed

+69
-69
lines changed

3 files changed

+69
-69
lines changed

‎generate/templates/templates/binding.gyp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@
125125
"vendor/openssl/include"
126126
],
127127
"libraries": [
128-
"<(module_root_dir)/vendor/openssl/lib/libcrypto.dylib",
129-
"<(module_root_dir)/vendor/openssl/lib/libssl.dylib"
128+
"<(module_root_dir)/vendor/openssl/lib/libcrypto.a",
129+
"<(module_root_dir)/vendor/openssl/lib/libssl.a"
130130
]
131131
}]
132132
],

‎utils/discoverOpenSSLDistros.js‎

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -5,128 +5,128 @@ const R = require('ramda');
55
const request = require('request-promise-native');
66

77
const windowsCommonConditions = [
8-
R.test(/os=Windows$/gm),
9-
R.test(/shared=False$/gm)
8+
R.test(/^\s*os=Windows$/gm),
9+
R.test(/^\s*shared=False$/gm)
1010
]
1111

1212
const macCommonConditions = [
13-
R.test(/arch=x86_64$/gm),
14-
R.test(/os=Macos$/gm),
15-
R.test(/compiler=apple-clang$/gm),
16-
R.test(/shared=False$/gm)
13+
R.test(/^\s*arch=x86_64$/gm),
14+
R.test(/^\s*os=Macos$/gm),
15+
R.test(/^\s*compiler=apple-clang$/gm),
16+
R.test(/^\s*shared=False$/gm)
1717
];
1818

1919
const debugPairs = R.toPairs({
2020
'win32-vs12-static-debug': R.allPass([
2121
...windowsCommonConditions,
22-
R.test(/arch=x86$/gm),
23-
R.test(/build_type=Debug$/gm),
24-
R.test(/compiler\.runtime=MTd$/gm),
25-
R.test(/compiler\.version=12$/gm)
22+
R.test(/^\s*arch=x86$/gm),
23+
R.test(/^\s*build_type=Debug$/gm),
24+
R.test(/^\s*compiler\.runtime=MTd$/gm),
25+
R.test(/^\s*compiler\.version=12$/gm)
2626
]),
2727
'win32-vs14-static-debug': R.allPass([
2828
...windowsCommonConditions,
29-
R.test(/arch=x86$/gm),
30-
R.test(/build_type=Debug$/gm),
31-
R.test(/compiler\.runtime=MTd$/gm),
32-
R.test(/compiler\.version=14$/gm)
29+
R.test(/^\s*arch=x86$/gm),
30+
R.test(/^\s*build_type=Debug$/gm),
31+
R.test(/^\s*compiler\.runtime=MTd$/gm),
32+
R.test(/^\s*compiler\.version=14$/gm)
3333
]),
3434
'win32-vs15-static-debug': R.allPass([
3535
...windowsCommonConditions,
36-
R.test(/arch=x86$/gm),
37-
R.test(/build_type=Debug$/gm),
38-
R.test(/compiler\.runtime=MTd$/gm),
39-
R.test(/compiler\.version=15$/gm)
36+
R.test(/^\s*arch=x86$/gm),
37+
R.test(/^\s*build_type=Debug$/gm),
38+
R.test(/^\s*compiler\.runtime=MTd$/gm),
39+
R.test(/^\s*compiler\.version=15$/gm)
4040
]),
4141

4242
'win64-vs12-static-debug': R.allPass([
4343
...windowsCommonConditions,
44-
R.test(/arch=x86_64$/gm),
45-
R.test(/build_type=Debug$/gm),
46-
R.test(/compiler\.runtime=MTd$/gm),
47-
R.test(/compiler\.version=12$/gm)
44+
R.test(/^\s*arch=x86_64$/gm),
45+
R.test(/^\s*build_type=Debug$/gm),
46+
R.test(/^\s*compiler\.runtime=MTd$/gm),
47+
R.test(/^\s*compiler\.version=12$/gm)
4848
]),
4949
'win64-vs14-static-debug': R.allPass([
5050
...windowsCommonConditions,
51-
R.test(/arch=x86_64$/gm),
52-
R.test(/build_type=Debug$/gm),
53-
R.test(/compiler\.runtime=MTd$/gm),
54-
R.test(/compiler\.version=14$/gm)
51+
R.test(/^\s*arch=x86_64$/gm),
52+
R.test(/^\s*build_type=Debug$/gm),
53+
R.test(/^\s*compiler\.runtime=MTd$/gm),
54+
R.test(/^\s*compiler\.version=14$/gm)
5555
]),
5656
'win64-vs15-static-debug': R.allPass([
5757
...windowsCommonConditions,
58-
R.test(/arch=x86_64$/gm),
59-
R.test(/build_type=Debug$/gm),
60-
R.test(/compiler\.runtime=MTd$/gm),
61-
R.test(/compiler\.version=15$/gm)
58+
R.test(/^\s*arch=x86_64$/gm),
59+
R.test(/^\s*build_type=Debug$/gm),
60+
R.test(/^\s*compiler\.runtime=MTd$/gm),
61+
R.test(/^\s*compiler\.version=15$/gm)
6262
]),
6363

6464
'macOS-clang-9-static-debug': R.allPass([
6565
...macCommonConditions,
66-
R.test(/build_type=Debug$/gm),
67-
R.test(/compiler\.version=9.0$/gm)
66+
R.test(/^\s*build_type=Debug$/gm),
67+
R.test(/^\s*compiler\.version=9.0$/gm)
6868
]),
6969
'macOS-clang-8.1-static-debug': R.allPass([
7070
...macCommonConditions,
71-
R.test(/build_type=Debug$/gm),
72-
R.test(/compiler\.version=8\.1$/gm)
71+
R.test(/^\s*build_type=Debug$/gm),
72+
R.test(/^\s*compiler\.version=8\.1$/gm)
7373
])
7474
})
7575

7676
const releasePairs = R.toPairs({
7777
'win32-vs12-static': R.allPass([
7878
...windowsCommonConditions,
79-
R.test(/arch=x86$/gm),
80-
R.test(/build_type=Release$/gm),
81-
R.test(/compiler\.runtime=MT$/gm),
82-
R.test(/compiler\.version=12$/gm)
79+
R.test(/^\s*arch=x86$/gm),
80+
R.test(/^\s*build_type=Release$/gm),
81+
R.test(/^\s*compiler\.runtime=MT$/gm),
82+
R.test(/^\s*compiler\.version=12$/gm)
8383
]),
8484
'win32-vs14-static': R.allPass([
8585
...windowsCommonConditions,
86-
R.test(/arch=x86$/gm),
87-
R.test(/build_type=Release$/gm),
88-
R.test(/compiler\.runtime=MT$/gm),
89-
R.test(/compiler\.version=14$/gm)
86+
R.test(/^\s*arch=x86$/gm),
87+
R.test(/^\s*build_type=Release$/gm),
88+
R.test(/^\s*compiler\.runtime=MT$/gm),
89+
R.test(/^\s*compiler\.version=14$/gm)
9090
]),
9191
'win32-vs15-static': R.allPass([
9292
...windowsCommonConditions,
93-
R.test(/arch=x86$/gm),
94-
R.test(/build_type=Release$/gm),
95-
R.test(/compiler\.runtime=MT$/gm),
96-
R.test(/compiler\.version=15$/gm)
93+
R.test(/^\s*arch=x86$/gm),
94+
R.test(/^\s*build_type=Release$/gm),
95+
R.test(/^\s*compiler\.runtime=MT$/gm),
96+
R.test(/^\s*compiler\.version=15$/gm)
9797
]),
9898

9999
'win64-vs12-static': R.allPass([
100100
...windowsCommonConditions,
101-
R.test(/arch=x86_64$/gm),
102-
R.test(/build_type=Release$/gm),
103-
R.test(/compiler\.runtime=MT$/gm),
104-
R.test(/compiler\.version=12$/gm)
101+
R.test(/^\s*arch=x86_64$/gm),
102+
R.test(/^\s*build_type=Release$/gm),
103+
R.test(/^\s*compiler\.runtime=MT$/gm),
104+
R.test(/^\s*compiler\.version=12$/gm)
105105
]),
106106
'win64-vs14-static': R.allPass([
107107
...windowsCommonConditions,
108-
R.test(/arch=x86_64$/gm),
109-
R.test(/build_type=Release$/gm),
110-
R.test(/compiler\.runtime=MT$/gm),
111-
R.test(/compiler\.version=14$/gm)
108+
R.test(/^\s*arch=x86_64$/gm),
109+
R.test(/^\s*build_type=Release$/gm),
110+
R.test(/^\s*compiler\.runtime=MT$/gm),
111+
R.test(/^\s*compiler\.version=14$/gm)
112112
]),
113113
'win64-vs15-static': R.allPass([
114114
...windowsCommonConditions,
115-
R.test(/arch=x86_64$/gm),
116-
R.test(/build_type=Release$/gm),
117-
R.test(/compiler\.runtime=MT$/gm),
118-
R.test(/compiler\.version=15$/gm)
115+
R.test(/^\s*arch=x86_64$/gm),
116+
R.test(/^\s*build_type=Release$/gm),
117+
R.test(/^\s*compiler\.runtime=MT$/gm),
118+
R.test(/^\s*compiler\.version=15$/gm)
119119
]),
120120

121121
'macOS-clang-9-static': R.allPass([
122122
...macCommonConditions,
123-
R.test(/build_type=Release$/gm),
124-
R.test(/compiler\.version=9.0$/gm)
123+
R.test(/^\s*build_type=Release$/gm),
124+
R.test(/^\s*compiler\.version=9.0$/gm)
125125
]),
126126
'macOS-clang-8.1-static': R.allPass([
127127
...macCommonConditions,
128-
R.test(/build_type=Release$/gm),
129-
R.test(/compiler\.version=8\.1$/gm)
128+
R.test(/^\s*build_type=Release$/gm),
129+
R.test(/^\s*compiler\.version=8\.1$/gm)
130130
])
131131
});
132132

@@ -172,7 +172,7 @@ const discoverDistributions = (treeHtml) => {
172172
);
173173
}
174174

175-
const outputPath = path.resolve('..', 'vendor', 'openssl_distributions.json');
175+
const outputPath = path.resolve(__dirname, '..', 'vendor', 'openssl_distributions.json');
176176
request(getDistributionsRootURL())
177177
.then(discoverDistributions)
178178
.then(R.filter(R.identity))

‎vendor/openssl_distributions.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"macOS-clang-8.1-static": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/4dc21962ebc63953d4b0879c71588b3b46212e03/conan_package.tgz",
3-
"macOS-clang-8.1-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/bb3dedf958bed17c8b7de4ab616b14d054cab175/conan_package.tgz",
4-
"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/ab7e33d40e9aa675c552b4a9be0cc5bb204a4eb5/conan_package.tgz",
2+
"macOS-clang-8.1-static": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/0197c20e330042c026560da838f5b4c4bf094b8a/conan_package.tgz",
3+
"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",
5+
"macOS-clang-9-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/85d674b0f6705cafe6b2edb8689ffbe0f3c2e60b/conan_package.tgz",
66
"win32-vs12-static": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/d16d8a16b4cef0046922b8d83d567689d36149d0/conan_package.tgz",
77
"win32-vs12-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/39d6fe009a278f733e97b59a4f9536bfc4e8f366/conan_package.tgz",
88
"win32-vs14-static": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/253958a6ce15f1c9325eeea33ffc0a5cfc29212a/conan_package.tgz",

0 commit comments

Comments
 (0)