Skip to content

Commit

Permalink
Use prebuild instead of node-pre-gyp
Browse files Browse the repository at this point in the history
  • Loading branch information
@stoefln
stoefln committed Jan 23, 2021
1 parent adea375 commit c0ecb15
Show file tree
Hide file tree
Showing 12 changed files with 80 additions and 79 deletions.
5 changes: 3 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,17 @@ old/
*-old/
*-notrack/
no-track/
build/
combo/
reference/
jscoverage_lib/
temp/
tmp/
prebuilds/

# vs code
.editorconfig
.vscode/c_cpp_properties.json
.vscode/settings.json
.vscode/tasks.json
.travis.yml
.travis.yml
.prebuildrc
16 changes: 8 additions & 8 deletions build/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,10 +278,10 @@ $(obj).$(TOOLSET)/%.o: $(srcdir)/%.m FORCE_DO_CMD
@$(call do_cmd,objc,1)
$(obj).$(TOOLSET)/%.o: $(srcdir)/%.mm FORCE_DO_CMD
@$(call do_cmd,objcxx,1)
$(obj).$(TOOLSET)/%.o: $(srcdir)/%.S FORCE_DO_CMD
@$(call do_cmd,cc,1)
$(obj).$(TOOLSET)/%.o: $(srcdir)/%.s FORCE_DO_CMD
@$(call do_cmd,cc,1)
$(obj).$(TOOLSET)/%.o: $(srcdir)/%.S FORCE_DO_CMD
@$(call do_cmd,cc,1)

# Try building from generated source, too.
$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.c FORCE_DO_CMD
Expand All @@ -296,10 +296,10 @@ $(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.m FORCE_DO_CMD
@$(call do_cmd,objc,1)
$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.mm FORCE_DO_CMD
@$(call do_cmd,objcxx,1)
$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.S FORCE_DO_CMD
@$(call do_cmd,cc,1)
$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.s FORCE_DO_CMD
@$(call do_cmd,cc,1)
$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.S FORCE_DO_CMD
@$(call do_cmd,cc,1)

$(obj).$(TOOLSET)/%.o: $(obj)/%.c FORCE_DO_CMD
@$(call do_cmd,cc,1)
Expand All @@ -313,10 +313,10 @@ $(obj).$(TOOLSET)/%.o: $(obj)/%.m FORCE_DO_CMD
@$(call do_cmd,objc,1)
$(obj).$(TOOLSET)/%.o: $(obj)/%.mm FORCE_DO_CMD
@$(call do_cmd,objcxx,1)
$(obj).$(TOOLSET)/%.o: $(obj)/%.S FORCE_DO_CMD
@$(call do_cmd,cc,1)
$(obj).$(TOOLSET)/%.o: $(obj)/%.s FORCE_DO_CMD
@$(call do_cmd,cc,1)
$(obj).$(TOOLSET)/%.o: $(obj)/%.S FORCE_DO_CMD
@$(call do_cmd,cc,1)


ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
Expand All @@ -326,8 +326,8 @@ ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
endif

quiet_cmd_regen_makefile = ACTION Regenerating $@
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
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
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
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
$(call do_cmd,regen_makefile)

# "all" is a concatenation of the "all" targets from all the included
Expand Down
42 changes: 21 additions & 21 deletions build/Release/.deps/Release/obj.target/node-native-ocr/cc/node-native-ocr.o.d
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
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
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
Release/obj.target/node-native-ocr/cc/node-native-ocr.o: \
../cc/node-native-ocr.cc ../node_modules/node-addon-api/napi.h \
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/node_api.h \
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/js_native_api.h \
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/js_native_api_types.h \
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/node_api_types.h \
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/node_api.h \
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/js_native_api.h \
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/js_native_api_types.h \
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/node_api_types.h \
../node_modules/node-addon-api/napi-inl.h \
../node_modules/node-addon-api/napi-inl.deprecated.h \
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv.h \
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv/errno.h \
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv/version.h \
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv/unix.h \
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv/threadpool.h \
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv/darwin.h \
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv.h \
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv/errno.h \
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv/version.h \
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv/unix.h \
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv/threadpool.h \
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv/darwin.h \
../cc/recognize.h
../cc/node-native-ocr.cc:
../node_modules/node-addon-api/napi.h:
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/node_api.h:
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/js_native_api.h:
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/js_native_api_types.h:
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/node_api_types.h:
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/node_api.h:
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/js_native_api.h:
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/js_native_api_types.h:
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/node_api_types.h:
../node_modules/node-addon-api/napi-inl.h:
../node_modules/node-addon-api/napi-inl.deprecated.h:
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv.h:
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv/errno.h:
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv/version.h:
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv/unix.h:
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv/threadpool.h:
/Users/steph/Library/Caches/node-gyp/12.13.1/include/node/uv/darwin.h:
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv.h:
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv/errno.h:
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv/version.h:
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv/unix.h:
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv/threadpool.h:
/var/folders/5h/gsjh01jn2079222pq9p4yhsr0000gn/T/prebuild/electron/5.0.6/include/node/uv/darwin.h:
../cc/recognize.h:
2 changes: 1 addition & 1 deletion build/Release/.deps/Release/obj.target/node-native-ocr/cc/ocr.o.d
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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
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
Release/obj.target/node-native-ocr/cc/ocr.o: ../cc/ocr.cc ../cc/ocr.h \
/usr/local/Cellar/tesseract/4.1.1/include/tesseract/baseapi.h \
/usr/local/Cellar/tesseract/4.1.1/include/tesseract/apitypes.h \
Expand Down
Loading

0 comments on commit c0ecb15

Please sign in to comment.