Skip to content

Commit 4a0faed

Browse files
committed
Prework: Move openssl_distributions file into vendor/static_config
1 parent 4cc8301 commit 4a0faed

File tree

6 files changed

+7
-6
lines changed

6 files changed

+7
-6
lines changed

generate/templates/templates/binding.gyp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"actions": [{
4040
"action_name": "acquire",
4141
"action": ["node", "utils/acquireOpenSSL.js"],
42-
"inputs": ["vendor/openssl_distributions.json"],
42+
"inputs": ["vendor/static_config/openssl_distributions.json"],
4343
"outputs": ["vendor/openssl"],
4444
"message": "Acquiring OpensSL binaries and headers"
4545
}]

utils/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
* Mac: clang-8.1 or clang-9.
1212
* Windows: vs12, vs14, vs15
1313

14-
The discovered distributions are written into `vendor/openssl_distributions.json`. This script does not need to be run unless you are updating the version of OpenSSL to build against.
14+
The discovered distributions are written into `vendor/static_config/openssl_distributions.json`. This script does not need to be run unless you are updating the version of OpenSSL to build against.
1515

16-
### acquireOpenSSL
17-
Download the OpenSSL binaries and headers applicable to the current OS for the latest compiler version (clang-9/vs14). Uses links from `vendor/openssl_distributions.json`.
16+
## acquireOpenSSL
17+
Download the OpenSSL binaries and headers applicable to the current OS for the latest compiler version (clang-9/vs14). Uses links from `vendor/static_config/openssl_distributions.json`.
1818

1919
TODO:
2020
* Make the script pull the debug versions if node-gyp is building in debug mode

utils/acquireOpenSSL.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const tar = require("tar-fs");
77
const zlib = require("zlib");
88

99
const vendorPath = path.resolve(__dirname, "..", "vendor");
10-
const distrosFilePath = path.join(vendorPath, "openssl_distributions.json");
10+
const distrosFilePath = path.join(vendorPath, "static_config", "openssl_distributions.json");
1111
const extractPath = path.join(vendorPath, "openssl");
1212

1313
const getOSName = () => {

utils/configureLibssh2.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ var rooted = function (dir) {
77
};
88

99
module.exports = function retrieveExternalDependencies() {
10+
// Do not configure on Windows
1011
if (process.platform === "win32") {
1112
return Promise.resolve("");
1213
}

utils/discoverOpenSSLDistros.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ const discoverDistributions = (treeHtml) => {
171171
);
172172
}
173173

174-
const outputPath = path.resolve(__dirname, "..", "vendor", "openssl_distributions.json");
174+
const outputPath = path.resolve(__dirname, "..", "vendor", "static_config", "openssl_distributions.json");
175175
request(getDistributionsRootURL())
176176
.then(discoverDistributions)
177177
.then(R.filter(R.identity))

0 commit comments

Comments
 (0)