Skip to content

Commit

Permalink
Hopefully fixed podspec issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@ericwlange
ericwlange committed Jan 17, 2020
1 parent dc23c55 commit afa598a
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 13 deletions.
3 changes: 2 additions & 1 deletion .npmignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ gradle/
gradle.properties
settings.gradle
.project
build.gradle
build.gradle
*.tgz
53 changes: 42 additions & 11 deletions LiquidCore.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ LiquidCore enables Node.js virtual machines to run inside iOS apps. It provides
bash LiquidCore/src/ios/generate_javascript_polyfills.sh
CMD
s.default_subspec = 'Core'
s.dependency 'LiquidCore-headers'

s.subspec 'Core' do |cs|
cs.dependency 'LiquidCore/uv'
Expand Down Expand Up @@ -256,12 +257,27 @@ LiquidCore enables Node.js virtual machines to run inside iOS apps. It provides
"deps/node-10.15.3/deps/uv/src/unix/fsevents.c",
"deps/node-10.15.3/deps/uv/src/unix/darwin-proctitle.c",
"deps/node-10.15.3/deps/uv/src/unix/bsd-ifaddrs.c",
"deps/node-10.15.3/deps/uv/src/unix/kqueue.c"
us.xcconfig = {
"deps/node-10.15.3/deps/uv/src/unix/kqueue.c",
"deps/node-10.15.3/deps/uv/src/uv-common.h",
"deps/node-10.15.3/deps/uv/src/unix/internal.h",
"deps/node-10.15.3/deps/uv/src/queue.h",
"deps/node-10.15.3/deps/uv/src/heap-inl.h",
"deps/node-10.15.3/deps/uv/src/unix/atomic-ops.h",
"deps/node-10.15.3/deps/uv/src/unix/spinlock.h"
us.private_header_files = [
"deps/node-10.15.3/deps/uv/src/uv-common.h",
"deps/node-10.15.3/deps/uv/src/unix/internal.h",
"deps/node-10.15.3/deps/uv/src/queue.h",
"deps/node-10.15.3/deps/uv/src/heap-inl.h",
"deps/node-10.15.3/deps/uv/src/unix/atomic-ops.h",
"deps/node-10.15.3/deps/uv/src/unix/spinlock.h"
]
us.xcconfig = {
:HEADER_SEARCH_PATHS => [
"$(PODS_TARGET_SRCROOT)/deps/node-10.15.3/deps/uv/include",
"$(PODS_TARGET_SRCROOT)/deps/node-10.15.3/deps/uv/src",
"$(PODS_TARGET_SRCROOT)/deps/node-10.15.3/deps/uv/src/unix",
# "$(PODS_TARGET_SRCROOT)/deps/node-10.15.3/deps/uv/include",
# "$(PODS_TARGET_SRCROOT)/deps/node-10.15.3/deps/uv/src",
# "$(PODS_TARGET_SRCROOT)/deps/node-10.15.3/deps/uv/src/unix",
"${PODS_CONFIGURATION_BUILD_DIR}/LiquidCore-headers/LiquidCore_headers.framework/PrivateHeaders",
].join(' '),
:OTHER_CFLAGS => [
'-D_DARWIN_USE_64_BIT_INODE=1',
Expand Down Expand Up @@ -327,9 +343,15 @@ LiquidCore enables Node.js virtual machines to run inside iOS apps. It provides
"deps/node-10.15.3/deps/cares/src/bitncmp.c",
"deps/node-10.15.3/deps/cares/src/inet_net_pton.c",
"deps/node-10.15.3/deps/cares/src/inet_ntop.c",
"deps/node-10.15.3/deps/cares/include/*.h"
"deps/node-10.15.3/deps/cares/include/*.h",
"deps/node-10.15.3/deps/cares/src/ares_setup.h",
"deps/node-10.15.3/deps/cares/config/darwin/ares_config.h",
"deps/node-10.15.3/deps/cares/src/*.h"
as.private_header_files = [
"deps/node-10.15.3/deps/cares/include/*.h"
"deps/node-10.15.3/deps/cares/include/*.h",
"deps/node-10.15.3/deps/cares/src/ares_setup.h",
"deps/node-10.15.3/deps/cares/config/darwin/ares_config.h",
"deps/node-10.15.3/deps/cares/src/*.h"
]
as.xcconfig = {
:HEADER_SEARCH_PATHS => [
Expand Down Expand Up @@ -376,11 +398,13 @@ LiquidCore enables Node.js virtual machines to run inside iOS apps. It provides
"deps/node-10.15.3/deps/nghttp2/lib/nghttp2_stream.c",
"deps/node-10.15.3/deps/nghttp2/lib/nghttp2_submit.c",
"deps/node-10.15.3/deps/nghttp2/lib/nghttp2_version.c",
"deps/node-10.15.3/deps/nghttp2/lib/*.h",
"deps/node-10.15.3/deps/http_parser/*.h",
"deps/node-10.15.3/deps/nghttp2/lib/includes/nghttp2/*.h"
hs.private_header_files = [
"deps/node-10.15.3/deps/http_parser/*.h",
"deps/node-10.15.3/deps/nghttp2/lib/includes/nghttp2/*.h",
"deps/node-10.15.3/deps/nghttp2/lib/*.h"
]
hs.xcconfig = {
:HEADER_SEARCH_PATHS => [
Expand Down Expand Up @@ -494,7 +518,11 @@ LiquidCore enables Node.js virtual machines to run inside iOS apps. It provides
"deps/node-10.15.3/deps/openssl/openssl/crypto/x509/*.c",
"deps/node-10.15.3/deps/openssl/openssl/crypto/x509v3/*.c",
"deps/node-10.15.3/deps/openssl/openssl/engines/e_capi.c",
"deps/node-10.15.3/deps/openssl/openssl/engines/e_padlock.c"
"deps/node-10.15.3/deps/openssl/openssl/engines/e_padlock.c",
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/des_locl.h",
"deps/node-10.15.3/deps/openssl/openssl/crypto/include/internal/cryptlib.h",
"deps/node-10.15.3/deps/openssl/openssl/e_os.h",
"deps/node-10.15.3/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslconf.h"
os.exclude_files = [
"deps/node-10.15.3/deps/openssl/openssl/crypto/arm_arch.c",
"deps/node-10.15.3/deps/openssl/openssl/crypto/ppc_arch.c",
Expand All @@ -509,14 +537,17 @@ LiquidCore enables Node.js virtual machines to run inside iOS apps. It provides
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/ncbc_enc.c",
"deps/node-10.15.3/deps/openssl/openssl/crypto/rc2/tab.c",
]
os.private_header_files = [
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/des_locl.h",
"deps/node-10.15.3/deps/openssl/openssl/crypto/include/internal/cryptlib.h",
"deps/node-10.15.3/deps/openssl/openssl/e_os.h",
]
os.xcconfig = {
# System Header Search Paths
:HEADER_SEARCH_PATHS => [
"$(PODS_TARGET_SRCROOT)/deps/node-10.15.3/deps/openssl/openssl/include",
"$(PODS_TARGET_SRCROOT)/deps/node-10.15.3/deps/openssl/openssl/crypto/include",
"$(PODS_TARGET_SRCROOT)/deps/node-10.15.3/deps/openssl/openssl/crypto/modes",
"$(PODS_TARGET_SRCROOT)/deps/node-10.15.3/deps/openssl/openssl",
"$(PODS_TARGET_SRCROOT)/deps/node-10.15.3/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto",
"${PODS_CONFIGURATION_BUILD_DIR}/LiquidCore-headers/LiquidCore_headers.framework/PrivateHeaders",
].join(' '),
:OTHER_CFLAGS => [
'-DOPENSSL_NO_HW',
Expand Down
1 change: 1 addition & 0 deletions LiquidCore/src/ios/copy_headers.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@ do
rsync -a --prune-empty-dirs --include '*/' --include '*.h' --exclude '*' "$INDIR/" "$OUTPUT_DIR/"
done
rm -rf "$OUTPUT_DIR/internal"
cp "$DEPS_DIR/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslconf.h" "$OUTPUT_DIR/openssl"

echo "Copied headers to: $OUTPUT_DIR";
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "liquidcore",
"version": "0.7.0",
"version": "0.7.2",
"description": "LiquidCore enables Node.js virtual machines to run inside Android and iOS apps. It provides a complete runtime environment, including a virtual file system.",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit afa598a

Please sign in to comment.