Skip to content

Node 10 support #1545

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 36 commits into from
Sep 28, 2018
Merged

Node 10 support #1545

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
579eb98
Update binding with curl-config for discovery of libcurl
implausible Sep 9, 2018
382bedb
Bump fs-extra to get rid of most promisify calls in nodegit
implausible Sep 9, 2018
1bf1dde
Bump libssh2
implausible Sep 9, 2018
189a46d
Use isolate version of ToInt32
implausible Sep 9, 2018
a53d000
Package lock changes from node 10
implausible Sep 9, 2018
4876b88
Drop node 9 for 10
implausible Sep 9, 2018
58063a5
Continue using OpenSSL over libgcrypt on windows
implausible Sep 9, 2018
5b8bc61
Do not compile openssl
emmax86 Sep 19, 2018
eda6d15
Include OpenSSL headers if building for Electron on macOS
emmax86 Sep 20, 2018
da3a2e5
Touch up Mac conditions, include OpenSSL on Windows for Electron
emmax86 Sep 20, 2018
fe11aab
Remove OpenSSL source as a vendored library
emmax86 Sep 20, 2018
115fcff
Dynamically link against OpenSSL on Linux/BSD
emmax86 Sep 20, 2018
c2503b0
Unmangle lib includes on Windows
emmax86 Sep 21, 2018
6cdcfd8
Use proper callback for setting thread ID in OpenSSL
emmax86 Sep 21, 2018
fde3782
Fix libssh2 linking errors to node's OpenSSL
emmax86 Sep 21, 2018
8f331f7
Pull down OpenSSL 1.1 on Mac CI
emmax86 Sep 21, 2018
371c67e
Calculate OS dependent directory on libssl configure
emmax86 Sep 21, 2018
49fc43b
Add script for discovering OpenSSL dependencies from Conan
emmax86 Sep 22, 2018
e369688
Touch up OpenSSL discovery script
emmax86 Sep 24, 2018
bc7fd43
Commit the OpenSSL distributions we currently want to pull from
emmax86 Sep 24, 2018
90bb388
Create a script for acquiring OpenSSL distributions based on OS/platform
emmax86 Sep 25, 2018
4d262fe
Fixup misdiscovered OpenSSL distros
emmax86 Sep 25, 2018
d3698fd
Add openssl to gitignore
emmax86 Sep 25, 2018
136dace
WIP on action for acquiring OpenSSL
emmax86 Sep 25, 2018
0f1ad0e
Fixed shipping wrong Mac OpenSSL distros 🙈
emmax86 Sep 26, 2018
1d33631
Specify configureLibssh as a dependency of libssh2
emmax86 Sep 26, 2018
3f7fab0
Only populate CPPFLAGs env variable during configureOpenSSL
emmax86 Sep 26, 2018
aa63038
Do not install Homebrew on Mac Travis
emmax86 Sep 26, 2018
1a09d76
Remove unused OpenSSL headers / binaries from Sigmoid
emmax86 Sep 26, 2018
44ae2b7
Document new files / changes
emmax86 Sep 26, 2018
c98a5be
Explicitly label release distributions of OpenSSL as such
emmax86 Sep 27, 2018
a686328
Update gitignore to ignore libssh2 generated files
emmax86 Sep 27, 2018
a637c19
Move ramda, request-promise-native, and tar-fs to deps from dev-deps
emmax86 Sep 27, 2018
3497732
Touch up README for utils, code formatting, links
emmax86 Sep 27, 2018
e01338f
Use R.find instead of R.reduce to do linear search on distribution pairs
emmax86 Sep 27, 2018
470f34d
Acquire VS14-compiled builds on Windows
emmax86 Sep 27, 2018
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
Prev Previous commit
Acquire VS14-compiled builds on Windows
  • Loading branch information
@emmax86
emmax86 committed Sep 27, 2018
commit 470f34ddbfc79f3736d6d18ae59fee54b28f37c0
2 changes: 1 addition & 1 deletion utils/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
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.

### acquireOpenSSL
Download the OpenSSL binaries and headers applicable to the current OS for the latest compiler version (clang-9/vs15). Uses links from `vendor/openssl_distributions.json`.
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`.

TODO:
* Make the script pull the debug versions if node-gyp is building in debug mode
Expand Down
6 changes: 3 additions & 3 deletions utils/acquireOpenSSL.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const getOSName = () => {
} else if (process.platform === "darwin") {
return "macOS";
} else {
// We only discover distros for Mac and Windows. We don"t care about any other OS.
// We only discover distros for Mac and Windows. We don't care about any other OS.
return "unknown";
}
};
Expand All @@ -29,11 +29,11 @@ const getCompilerVersion = () => {
// TODO: Get actual compiler version. For now, just assume latest compiler for distros in openssl_distributions.js
const osName = getOSName();
if (osName === "win32" || osName === "win64") {
return "vs15";
return "vs14";
} else if (osName === "macOS") {
return "clang-9";
} else {
// We only discover distros for Mac and Windows. We don"t care about any other OS.
// We only discover distros for Mac and Windows. We don't care about any other OS.
return "unknown";
}
};
Expand Down