Update with upstream mapbox/node-sqlcipher3 #47
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* add electron 4.1 and 4.2 * add electron 4.1 and 4.2 for windows
Raspbian is used as base It took less than 20 min to build on Ubuntu 18.04 x86_64 If merged other arch will come next, and then automated by CI. Relate-to: TryGhost/node-sqlite3#418 Change-Id: Ic92baf3e019e28862a24d84728835a641a6838c1 Forwarded: TryGhost/node-sqlite3#1169 Signed-off-by: Philippe Coval <[email protected]>
* prebuilt: add electron 6.0.0 * node: use Node 6 for test suite
Update SQLite3 to 3.30.1 sha1sum ``` 8383f29d53fa1d4383e4c8eb3e087f2ed940a9e0 sqlite-autoconf-3300100.tar.gz ``` sha256sum ``` 8c5a50db089bd2a1b08dbc5b00d2027602ca7ff238ba7658fabca454d4298e60 sqlite-autoconf-3300100.tar.gz ``` Verified to match https://sqlite.org/download.html
node-gyp uses 'msbuild_toolset' in 'target_defaults' to specify what toolset should be used, according to what version of Visual Studio was detected. Before this change, when 'toolset' was not specified, node-sqlite3 failed to compile with any version of Visual Studio after 2015, because gyp fails to detect the toolset correctly. With this change 'toolset' is only used if defined, fixing compilation with node-gyp and recent VS versions.
…(#1245) * deps: alternative update of node-gyp for electron (v5 & v6), windows
* prebuilt: electron 7.1 (Windows) * prebuilt: electron 7.1 (linux & osx) * upgrade node to 8 for 7.1
Deprecated since Electron v7.0. https://github.com/electron/electron/blob/master/docs/breaking-changes.md#node-headers-url
* Update common-sqlite.gypi * replace sqlite-autoconf-3310100.tar.gz
Fixes #1293
… webpack … (#1268) * Split sqlite3-binding.js out so that it could be override by webpack options. Co-authored-by: Kewde <[email protected]>
prebuilt: remove Node v10.x
ci: remove permissions UAC
Change-Id: I79000463955d16eec8809c870f7d02c60da53432 Bug: TryGhost/node-sqlite3#418 Relate-to: TryGhost/node-sqlite3#1028 Origin: https://github.com/tizenteam/node-sqlite3 Signed-off-by: Philippe Coval <[email protected]>
- This updates the README to be inline with what's in master
* Ensure JavaScript exceptions bubble up * Fix segfault * Fix mutex segfault * Fix segfault caused by memory leak If the database was being closed, and non-exclusive work was scheduled, it overrode the lock flag such that the state became open=false locked=false instead of open=false locked=true. This caused queued work to not be processed, leaking memory, which causes a segfault during napi cleanup. Make the same changes to other methods for safe measure.
* release: 5.0.1 * release: update log
rkistner
force-pushed
the
merge-upstream
branch
from
334cd9a
to
8215e1f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Applicable changelog copied here.
The big change is using N-API for builds, which means we won't need a separate pre-built binary for every Electron or Node version: TryGhost/node-sqlite3#1304
sqlite3 version is not changed by this PR.
Many of the changes below are not relevant for this fork and have been crossed out.
5.0.1
build: Install files to be deployedsqlite3: upgrade to 3.32.35.0.0
prebuilt: add electron 7.24.2.0
sqlite3: update to 3.31.1 (3310100)deps: alternative update of node-gyp for electron (v1 - v4), windowsdocs: Added json1 support note4.1.1
Electron v6.1 and v7 supportElectron v7.1 supportSQLite3 update to 3.30.1Upgrade CI to node-gyp 6.x for Windows Electron v5 & v6 buildsNode v13 supportUse minimum supported node version for Electron 74.1.0
Electron v6 supportElectron v4.1 and v4.2 supportCustom file header with--sqlite_magic