Skip to content
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

Jump to bottom

fix for windows build for node-sqlcipher 5.0.0 #60

Closed
wants to merge 6 commits into from
Closed

fix for windows build for node-sqlcipher 5.0.0 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5b69d5f
Fix for old NAPI
jaimecoj Dec 10, 2020
696f745
Replace file
jaimecoj Dec 10, 2020
7a2f2bb
revert deps/sqlcipher-amalgamation-3031000
Dec 10, 2020
9795fd8
hard code napi-v3 version
Dec 14, 2020
16218ca
test with hard coded napi v3
Dec 14, 2020
7edefd0
fix comma
Dec 14, 2020
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
Empty file modified deps/sqlcipher-amalgamation-3031000.tar.gz
100644 → 100755
View file
Open in desktop
Empty file.
8 changes: 2 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,10 @@
},
"binary": {
"module_name": "node_sqlite3",
"module_path": "./lib/binding/napi-v{napi_build_version}-{platform}-{arch}",
"module_path": "./lib/binding/napi-v3-{platform}-{arch}",
"host": "https://journeyapps-node-binary.s3.amazonaws.com",
"remote_path": "./{name}/v{version}/{toolset}/",
"package_name": "napi-v{napi_build_version}-{platform}-{arch}.tar.gz",
"napi_versions": [
3,
6
]
"package_name": "napi-v3-{platform}-{arch}.tar.gz"
},
"contributors": [
"Konstantin Käfer <[email protected]>",
Expand Down
4 changes: 2 additions & 2 deletions src/database.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

using namespace node_sqlite3;

#if NAPI_VERSION < 6
#if NAPI_VERSION < 6 || TRUE
Napi::FunctionReference Database::constructor;
#endif

Expand All @@ -26,7 +26,7 @@ Napi::Object Database::Init(Napi::Env env, Napi::Object exports) {
InstanceAccessor("open", &Database::OpenGetter, nullptr)
});

#if NAPI_VERSION < 6
#if NAPI_VERSION < 6 || TRUE
constructor = Napi::Persistent(t);
constructor.SuppressDestruct();
#else
Expand Down
4 changes: 2 additions & 2 deletions src/database.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Database;

class Database : public Napi::ObjectWrap<Database> {
public:
#if NAPI_VERSION < 6
#if NAPI_VERSION < 6 || TRUE
static Napi::FunctionReference constructor;
#endif
static Napi::Object Init(Napi::Env env, Napi::Object exports);
Expand All @@ -31,7 +31,7 @@ class Database : public Napi::ObjectWrap<Database> {
Napi::HandleScope scope(env);
if (!val.IsObject()) return false;
Napi::Object obj = val.As<Napi::Object>();
#if NAPI_VERSION < 6
#if NAPI_VERSION < 6 || TRUE
return obj.InstanceOf(constructor.Value());
#else
Napi::FunctionReference* constructor =
Expand Down