Skip to content

Commit f58d14e

Browse files
committed
update modules, support node 8.6.0+
1 parent 0910bb3 commit f58d14e

File tree

6 files changed

+41
-42
lines changed

6 files changed

+41
-42
lines changed

build/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,8 @@ ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
308308
endif
309309

310310
quiet_cmd_regen_makefile = ACTION Regenerating $@
311-
cmd_regen_makefile = cd $(srcdir); /usr/local/lib/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/home/magiclen/npm/node-stringbuilder/build/config.gypi -I/usr/local/lib/node_modules/node-gyp/addon.gypi -I/home/magiclen/.node-gyp/8.4.0/include/node/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/home/magiclen/.node-gyp/8.4.0" "-Dnode_gyp_dir=/usr/local/lib/node_modules/node-gyp" "-Dnode_lib_file=/home/magiclen/.node-gyp/8.4.0/<(target_arch)/node.lib" "-Dmodule_root_dir=/home/magiclen/npm/node-stringbuilder" "-Dnode_engine=v8" binding.gyp
312-
Makefile: $(srcdir)/../../.node-gyp/8.4.0/include/node/common.gypi $(srcdir)/build/config.gypi $(srcdir)/binding.gyp $(srcdir)/../../../../usr/local/lib/node_modules/node-gyp/addon.gypi
311+
cmd_regen_makefile = cd $(srcdir); /usr/local/lib/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/home/magiclen/npm/node-stringbuilder/build/config.gypi -I/usr/local/lib/node_modules/node-gyp/addon.gypi -I/home/magiclen/.node-gyp/8.6.0/include/node/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/home/magiclen/.node-gyp/8.6.0" "-Dnode_gyp_dir=/usr/local/lib/node_modules/node-gyp" "-Dnode_lib_file=/home/magiclen/.node-gyp/8.6.0/<(target_arch)/node.lib" "-Dmodule_root_dir=/home/magiclen/npm/node-stringbuilder" "-Dnode_engine=v8" binding.gyp
312+
Makefile: $(srcdir)/../../.node-gyp/8.6.0/include/node/common.gypi $(srcdir)/build/config.gypi $(srcdir)/binding.gyp $(srcdir)/../../../../usr/local/lib/node_modules/node-gyp/addon.gypi
313313
$(call do_cmd,regen_makefile)
314314

315315
# "all" is a concatenation of the "all" targets from all the included

build/config.gypi

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,9 @@
6161
"v8_promise_internal_field_count": 1,
6262
"v8_random_seed": 0,
6363
"v8_trace_maps": 0,
64-
"v8_use_snapshot": "false",
64+
"v8_use_snapshot": "true",
6565
"want_separate_host_toolset": 0,
66-
"want_separate_host_toolset_mkpeephole": 0,
67-
"nodedir": "/home/magiclen/.node-gyp/8.4.0",
66+
"nodedir": "/home/magiclen/.node-gyp/8.6.0",
6867
"standalone_static_library": 1
6968
}
7069
}

build/node-stringbuilder.target.mk

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ CFLAGS_CC_Debug := \
3535
-std=gnu++0x
3636

3737
INCS_Debug := \
38-
-I/home/magiclen/.node-gyp/8.4.0/include/node \
39-
-I/home/magiclen/.node-gyp/8.4.0/src \
40-
-I/home/magiclen/.node-gyp/8.4.0/deps/uv/include \
41-
-I/home/magiclen/.node-gyp/8.4.0/deps/v8/include
38+
-I/home/magiclen/.node-gyp/8.6.0/include/node \
39+
-I/home/magiclen/.node-gyp/8.6.0/src \
40+
-I/home/magiclen/.node-gyp/8.6.0/deps/uv/include \
41+
-I/home/magiclen/.node-gyp/8.6.0/deps/v8/include
4242

4343
DEFS_Release := \
4444
'-DNODE_GYP_MODULE_NAME=node-stringbuilder' \
@@ -70,10 +70,10 @@ CFLAGS_CC_Release := \
7070
-std=gnu++0x
7171

7272
INCS_Release := \
73-
-I/home/magiclen/.node-gyp/8.4.0/include/node \
74-
-I/home/magiclen/.node-gyp/8.4.0/src \
75-
-I/home/magiclen/.node-gyp/8.4.0/deps/uv/include \
76-
-I/home/magiclen/.node-gyp/8.4.0/deps/v8/include
73+
-I/home/magiclen/.node-gyp/8.6.0/include/node \
74+
-I/home/magiclen/.node-gyp/8.6.0/src \
75+
-I/home/magiclen/.node-gyp/8.6.0/deps/uv/include \
76+
-I/home/magiclen/.node-gyp/8.6.0/deps/v8/include
7777

7878
OBJS := \
7979
$(obj).target/$(TARGET)/src/node-stringbuilder.o

package-lock.json

Lines changed: 20 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "node-stringbuilder",
3-
"version": "2.1.1",
3+
"version": "2.2.0",
44
"description": "An easy and fast in-memory string builder for Node.js.",
55
"main": "index.js",
66
"scripts": {
7-
"test": "mocha --napi-modules --reporter spec",
8-
"benchmark": "mocha --napi-modules --reporter spec benchmark"
7+
"test": "mocha --reporter spec",
8+
"benchmark": "mocha --reporter spec benchmark"
99
},
1010
"repository": {
1111
"type": "git",
@@ -27,11 +27,11 @@
2727
},
2828
"homepage": "https://github.com/magiclen/node-stringbuilder#readme",
2929
"engines": {
30-
"node": ">=8.4.0"
30+
"node": ">=8.6.0"
3131
},
3232
"devDependencies": {
33-
"chai": "^4.1.1",
34-
"mocha": "^3.5.0",
33+
"chai": "^4.1.2",
34+
"mocha": "^3.5.3",
3535
"mocha-logger": "^1.0.5"
3636
},
3737
"dependencies": {

src/node-stringbuilder.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1920,7 +1920,7 @@ napi_value constructor(napi_env env, napi_callback_info info){
19201920
return me;
19211921
}
19221922

1923-
void Init (napi_env env, napi_value exports, napi_value module, void* priv) {
1923+
napi_value Init (napi_env env, napi_value exports) {
19241924
napi_property_descriptor allDesc[] = {
19251925
{"from", 0, from, 0, 0, 0, napi_default, 0},
19261926
{"_initialize", 0, initialize, 0, 0, 0, napi_default, 0}
@@ -1969,7 +1969,7 @@ void Init (napi_env env, napi_value exports, napi_value module, void* priv) {
19691969
{"shrinkCapacity", 0, ShrinkCapacity, 0, 0, 0, napi_default, 0}
19701970
};
19711971
napi_value cons;
1972-
napi_define_class(env, "StringBuilder", constructor, 0, 39, stringBuilderAllDesc, &cons);
1972+
napi_define_class(env, "StringBuilder", -1, constructor, 0, 39, stringBuilderAllDesc, &cons);
19731973
napi_set_named_property(env, exports, "StringBuilder", cons);
19741974
napi_create_reference(env, cons, 1, &StringBuilderRef);
19751975

@@ -1980,6 +1980,7 @@ void Init (napi_env env, napi_value exports, napi_value module, void* priv) {
19801980
napi_create_int32(env, 0, &bFalse);
19811981
napi_coerce_to_bool(env, bFalse, &bFalse);
19821982
napi_create_reference(env, bFalse, 1, &FalseRef);
1983+
return exports;
19831984
}
19841985

19851986
NAPI_MODULE(node_stringbuilder, Init);

0 commit comments

Comments
 (0)