Skip to content

Commit c0ecb15

Browse files
committed
Use prebuild instead of node-pre-gyp
1 parent adea375 commit c0ecb15

File tree

12 files changed

+80
-79
lines changed

12 files changed

+80
-79
lines changed

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,17 @@ old/
4949
*-old/
5050
*-notrack/
5151
no-track/
52-
build/
5352
combo/
5453
reference/
5554
jscoverage_lib/
5655
temp/
5756
tmp/
57+
prebuilds/
5858

5959
# vs code
6060
.editorconfig
6161
.vscode/c_cpp_properties.json
6262
.vscode/settings.json
6363
.vscode/tasks.json
64-
.travis.yml
64+
.travis.yml
65+
.prebuildrc

build/Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,10 @@ $(obj).$(TOOLSET)/%.o: $(srcdir)/%.m FORCE_DO_CMD
278278
@$(call do_cmd,objc,1)
279279
$(obj).$(TOOLSET)/%.o: $(srcdir)/%.mm FORCE_DO_CMD
280280
@$(call do_cmd,objcxx,1)
281-
$(obj).$(TOOLSET)/%.o: $(srcdir)/%.S FORCE_DO_CMD
282-
@$(call do_cmd,cc,1)
283281
$(obj).$(TOOLSET)/%.o: $(srcdir)/%.s FORCE_DO_CMD
284282
@$(call do_cmd,cc,1)
283+
$(obj).$(TOOLSET)/%.o: $(srcdir)/%.S FORCE_DO_CMD
284+
@$(call do_cmd,cc,1)
285285

286286
# Try building from generated source, too.
287287
$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.c FORCE_DO_CMD
@@ -296,10 +296,10 @@ $(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.m FORCE_DO_CMD
296296
@$(call do_cmd,objc,1)
297297
$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.mm FORCE_DO_CMD
298298
@$(call do_cmd,objcxx,1)
299-
$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.S FORCE_DO_CMD
300-
@$(call do_cmd,cc,1)
301299
$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.s FORCE_DO_CMD
302300
@$(call do_cmd,cc,1)
301+
$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.S FORCE_DO_CMD
302+
@$(call do_cmd,cc,1)
303303

304304
$(obj).$(TOOLSET)/%.o: $(obj)/%.c FORCE_DO_CMD
305305
@$(call do_cmd,cc,1)
@@ -313,10 +313,10 @@ $(obj).$(TOOLSET)/%.o: $(obj)/%.m FORCE_DO_CMD
313313
@$(call do_cmd,objc,1)
314314
$(obj).$(TOOLSET)/%.o: $(obj)/%.mm FORCE_DO_CMD
315315
@$(call do_cmd,objcxx,1)
316-
$(obj).$(TOOLSET)/%.o: $(obj)/%.S FORCE_DO_CMD
317-
@$(call do_cmd,cc,1)
318316
$(obj).$(TOOLSET)/%.o: $(obj)/%.s FORCE_DO_CMD
319317
@$(call do_cmd,cc,1)
318+
$(obj).$(TOOLSET)/%.o: $(obj)/%.S FORCE_DO_CMD
319+
@$(call do_cmd,cc,1)
320320

321321

322322
ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
@@ -326,8 +326,8 @@ ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
326326
endif
327327

328328
quiet_cmd_regen_makefile = ACTION Regenerating $@
329-
cmd_regen_makefile = cd $(srcdir); /Users/steph/.nvm/versions/node/v12.13.1/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/Users/steph/Documents/workspace/node-native-ocr/build/config.gypi -I/Users/steph/.nvm/versions/node/v12.13.1/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/steph/Library/Caches/node-gyp/12.13.1" "-Dnode_gyp_dir=/Users/steph/.nvm/versions/node/v12.13.1/lib/node_modules/npm/node_modules/node-gyp" "-Dnode_lib_file=/Users/steph/Library/Caches/node-gyp/12.13.1/<(target_arch)/node.lib" "-Dmodule_root_dir=/Users/steph/Documents/workspace/node-native-ocr" "-Dnode_engine=v8" binding.gyp
330-
Makefile: $(srcdir)/../../../.nvm/versions/node/v12.13.1/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/../../../Library/Caches/node-gyp/12.13.1/include/node/common.gypi $(srcdir)/build/config.gypi $(srcdir)/binding.gyp
329+
cmd_regen_makefile = cd $(srcdir); /Users/steph/.nvm/versions/node/v12.13.1/lib/node_modules/prebuild/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6" "-Dnode_gyp_dir=/Users/steph/.nvm/versions/node/v12.13.1/lib/node_modules/prebuild/node_modules/node-gyp" "-Dnode_lib_file=/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/<(target_arch)/node.lib" "-Dmodule_root_dir=/Users/steph/Documents/workspace/node-native-ocr" "-Dnode_engine=v8" "--depth=." "-Goutput_dir=." "--generator-output=build" -I/Users/steph/Documents/workspace/node-native-ocr/build/config.gypi -I/Users/steph/.nvm/versions/node/v12.13.1/lib/node_modules/prebuild/node_modules/node-gyp/addon.gypi -I/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/common.gypi "--toplevel-dir=." binding.gyp
330+
Makefile: $(srcdir)/binding.gyp $(srcdir)/build/config.gypi $(srcdir)/../../../../../private/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/common.gypi $(srcdir)/../../../.nvm/versions/node/v12.13.1/lib/node_modules/prebuild/node_modules/node-gyp/addon.gypi
331331
$(call do_cmd,regen_makefile)
332332

333333
# "all" is a concatenation of the "all" targets from all the included
Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
cmd_Release/obj.target/node-native-ocr/cc/node-native-ocr.o := c++ '-DNODE_GYP_MODULE_NAME=node-native-ocr' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-DV8_DEPRECATION_WARNINGS' '-DV8_IMMINENT_DEPRECATION_WARNINGS' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DOPENSSL_NO_PINSHARED' '-DOPENSSL_THREADS' '-DBUILDING_NODE_EXTENSION' -I/Users/steph/Library/Caches/node-gyp/12.13.1/include/node -I/Users/steph/Library/Caches/node-gyp/12.13.1/src -I/Users/steph/Library/Caches/node-gyp/12.13.1/deps/openssl/config -I/Users/steph/Library/Caches/node-gyp/12.13.1/deps/openssl/openssl/include -I/Users/steph/Library/Caches/node-gyp/12.13.1/deps/uv/include -I/Users/steph/Library/Caches/node-gyp/12.13.1/deps/zlib -I/Users/steph/Library/Caches/node-gyp/12.13.1/deps/v8/include -I../node_modules/node-addon-api -I/usr/local/Cellar/tesseract/4.1.1/include -I/usr/local/Cellar/leptonica/1.80.0/include/leptonica -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++1y -stdlib=libc++ -fno-rtti -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/node-native-ocr/cc/node-native-ocr.o.d.raw -c -o Release/obj.target/node-native-ocr/cc/node-native-ocr.o ../cc/node-native-ocr.cc
1+
cmd_Release/obj.target/node-native-ocr/cc/node-native-ocr.o := c++ '-DNODE_GYP_MODULE_NAME=node-native-ocr' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-DV8_DEPRECATION_WARNINGS' '-DV8_IMMINENT_DEPRECATION_WARNINGS' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DOPENSSL_THREADS' '-DBUILDING_NODE_EXTENSION' -I/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node -I/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/src -I/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/deps/openssl/config -I/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/deps/openssl/openssl/include -I/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/deps/uv/include -I/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/deps/zlib -I/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/deps/v8/include -I../node_modules/node-addon-api -I/usr/local/Cellar/tesseract/4.1.1/include -I/usr/local/Cellar/leptonica/1.80.0/include/leptonica -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++1y -stdlib=libc++ -fno-rtti -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/node-native-ocr/cc/node-native-ocr.o.d.raw -c -o Release/obj.target/node-native-ocr/cc/node-native-ocr.o ../cc/node-native-ocr.cc
22
Release/obj.target/node-native-ocr/cc/node-native-ocr.o: \
33
../cc/node-native-ocr.cc ../node_modules/node-addon-api/napi.h \
4-
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/node_api.h \
5-
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/js_native_api.h \
6-
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/js_native_api_types.h \
7-
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/node_api_types.h \
4+
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/node_api.h \
5+
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/js_native_api.h \
6+
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/js_native_api_types.h \
7+
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/node_api_types.h \
88
../node_modules/node-addon-api/napi-inl.h \
99
../node_modules/node-addon-api/napi-inl.deprecated.h \
10-
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv.h \
11-
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv/errno.h \
12-
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv/version.h \
13-
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv/unix.h \
14-
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv/threadpool.h \
15-
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv/darwin.h \
10+
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv.h \
11+
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv/errno.h \
12+
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv/version.h \
13+
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv/unix.h \
14+
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv/threadpool.h \
15+
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv/darwin.h \
1616
../cc/recognize.h
1717
../cc/node-native-ocr.cc:
1818
../node_modules/node-addon-api/napi.h:
19-
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/node_api.h:
20-
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/js_native_api.h:
21-
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/js_native_api_types.h:
22-
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/node_api_types.h:
19+
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/node_api.h:
20+
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/js_native_api.h:
21+
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/js_native_api_types.h:
22+
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/node_api_types.h:
2323
../node_modules/node-addon-api/napi-inl.h:
2424
../node_modules/node-addon-api/napi-inl.deprecated.h:
25-
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv.h:
26-
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv/errno.h:
27-
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv/version.h:
28-
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv/unix.h:
29-
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv/threadpool.h:
30-
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv/darwin.h:
25+
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv.h:
26+
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv/errno.h:
27+
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv/version.h:
28+
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv/unix.h:
29+
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv/threadpool.h:
30+
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv/darwin.h:
3131
../cc/recognize.h:

build/Release/.deps/Release/obj.target/node-native-ocr/cc/ocr.o.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmd_Release/obj.target/node-native-ocr/cc/ocr.o := c++ '-DNODE_GYP_MODULE_NAME=node-native-ocr' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-DV8_DEPRECATION_WARNINGS' '-DV8_IMMINENT_DEPRECATION_WARNINGS' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DOPENSSL_NO_PINSHARED' '-DOPENSSL_THREADS' '-DBUILDING_NODE_EXTENSION' -I/Users/steph/Library/Caches/node-gyp/12.13.1/include/node -I/Users/steph/Library/Caches/node-gyp/12.13.1/src -I/Users/steph/Library/Caches/node-gyp/12.13.1/deps/openssl/config -I/Users/steph/Library/Caches/node-gyp/12.13.1/deps/openssl/openssl/include -I/Users/steph/Library/Caches/node-gyp/12.13.1/deps/uv/include -I/Users/steph/Library/Caches/node-gyp/12.13.1/deps/zlib -I/Users/steph/Library/Caches/node-gyp/12.13.1/deps/v8/include -I../node_modules/node-addon-api -I/usr/local/Cellar/tesseract/4.1.1/include -I/usr/local/Cellar/leptonica/1.80.0/include/leptonica -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++1y -stdlib=libc++ -fno-rtti -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/node-native-ocr/cc/ocr.o.d.raw -c -o Release/obj.target/node-native-ocr/cc/ocr.o ../cc/ocr.cc
1+
cmd_Release/obj.target/node-native-ocr/cc/ocr.o := c++ '-DNODE_GYP_MODULE_NAME=node-native-ocr' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-DV8_DEPRECATION_WARNINGS' '-DV8_IMMINENT_DEPRECATION_WARNINGS' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DOPENSSL_THREADS' '-DBUILDING_NODE_EXTENSION' -I/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node -I/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/src -I/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/deps/openssl/config -I/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/deps/openssl/openssl/include -I/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/deps/uv/include -I/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/deps/zlib -I/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/deps/v8/include -I../node_modules/node-addon-api -I/usr/local/Cellar/tesseract/4.1.1/include -I/usr/local/Cellar/leptonica/1.80.0/include/leptonica -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++1y -stdlib=libc++ -fno-rtti -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/node-native-ocr/cc/ocr.o.d.raw -c -o Release/obj.target/node-native-ocr/cc/ocr.o ../cc/ocr.cc
22
Release/obj.target/node-native-ocr/cc/ocr.o: ../cc/ocr.cc ../cc/ocr.h \
33
/usr/local/Cellar/tesseract/4.1.1/include/tesseract/baseapi.h \
44
/usr/local/Cellar/tesseract/4.1.1/include/tesseract/apitypes.h \

0 commit comments

Comments
 (0)