Skip to content

Clean up libssh2 configure step #1574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
implausible merged 2 commits into from
Jan 16, 2019
Merged

Clean up libssh2 configure step #1574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
501210d
Clean up libssh2 configure step
emmax86 Oct 25, 2018
6085c6c
Simplify is_electron condition
emmax86 Jan 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 7 additions & 27 deletions generate/templates/templates/binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,13 @@
{
"conditions": [
["(OS=='win' and node_root_dir.split('\\\\')[-1].startswith('iojs')) or (OS=='mac' and node_root_dir.split('/')[-1].startswith('iojs'))", {
"conditions": [
["OS=='win'", {
"variables": {
"is_electron%": "1",
"openssl_include_dir%": "<(module_root_dir)\\vendor\\openssl"
Comment thread
emmax86 marked this conversation as resolved.
}
}, {
"variables": {
"is_electron%": "1",
"openssl_include_dir%": "<(module_root_dir)/vendor/openssl"
}
}]
],
"variables": {
"is_electron%": "1",
}
}, {
"conditions": [
["OS=='win'", {
"variables": {
"is_electron%": "0",
"openssl_include_dir%": "<(node_root_dir)\\include\\node"
}
}, {
"variables": {
"is_electron%": "0",
"openssl_include_dir%": "<(node_root_dir)/include/node"
}
}]
]
"variables": {
"is_electron%": "0",
}
}]
],

Expand All @@ -50,7 +30,7 @@
"target_name": "configureLibssh2",
"actions": [{
"action_name": "configure",
"action": ["node", "utils/configureLibssh2.js", "<(openssl_include_dir)", "<(is_electron)"],
"action": ["node", "utils/configureLibssh2.js"],
"inputs": [""],
"outputs": [""]
}],
Expand Down
18 changes: 2 additions & 16 deletions utils/configureLibssh2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var cp = require("child_process");
var fse = require('fs-extra');
var fse = require("fs-extra");
var path = require("path");

const libssh2VendorDirectory = path.resolve(__dirname, "..", "vendor", "libssh2");
Expand All @@ -19,27 +19,13 @@ module.exports = function retrieveExternalDependencies() {

// Run the `configure` script on Linux
return new Promise(function(resolve, reject) {

var opensslDir = process.argv[2];
var isElectron = process.argv[3] === "1";
var opensslIncludes = isElectron ? path.join(opensslDir, "includes") : opensslDir;

var newEnv = {};
Object.keys(process.env).forEach(function(key) {
newEnv[key] = process.env[key];
});

newEnv.CPPFLAGS = newEnv.CPPFLAGS || "";
newEnv.CPPFLAGS += ` -I${opensslIncludes}`;
newEnv.CPPFLAGS = newEnv.CPPFLAGS.trim();

var maybeLibsslPrefix = "";
if (isElectron) {
maybeLibsslPrefix = ` --with-libssl-prefix=${opensslDir}`;
}

cp.exec(
libssh2ConfigureScript + maybeLibsslPrefix,
libssh2ConfigureScript,
{
cwd: libssh2VendorDirectory,
env: newEnv
Expand Down