Skip to content

Commit bf9cdcd

Browse files
author
Eric Lange
committed
Fixed podspec issues with 0.7.0
1 parent afa598a commit bf9cdcd

1 file changed

Lines changed: 175 additions & 12 deletions

File tree

‎LiquidCore.podspec‎

Lines changed: 175 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LiquidCore enables Node.js virtual machines to run inside iOS apps. It provides
2121
bash LiquidCore/src/ios/generate_javascript_polyfills.sh
2222
CMD
2323
s.default_subspec = 'Core'
24-
s.dependency 'LiquidCore-headers'
24+
s.dependency 'LiquidCore-headers', version
2525

2626
s.subspec 'Core' do |cs|
2727
cs.dependency 'LiquidCore/uv'
@@ -40,6 +40,9 @@ LiquidCore enables Node.js virtual machines to run inside iOS apps. It provides
4040
"deps/node-10.15.3/deps/v8/src/libplatform/tracing/trace-writer.cc",
4141
"deps/node-10.15.3/deps/v8/src/libplatform/tracing/tracing-controller.cc",
4242
"deps/node-10.15.3/deps/v8/src/libplatform/worker-thread.cc",
43+
"deps/node-10.15.3/deps/v8/src/libplatform/worker-thread.h",
44+
"deps/node-10.15.3/deps/v8/include/libplatform/*.h",
45+
"deps/node-10.15.3/deps/v8/include/*.h",
4346

4447
# v8_libbase
4548
"deps/node-10.15.3/deps/v8/src/base/bits.cc",
@@ -62,6 +65,8 @@ LiquidCore enables Node.js virtual machines to run inside iOS apps. It provides
6265
"deps/node-10.15.3/deps/v8/src/base/platform/platform-macos.cc",
6366
"deps/node-10.15.3/deps/v8/src/base/platform/platform-posix.cc",
6467
"deps/node-10.15.3/deps/v8/src/base/platform/platform-posix-time.cc",
68+
"deps/node-10.15.3/deps/v8/src/base/platform/platform*.h",
69+
"deps/node-10.15.3/deps/v8/src/base/compiler*.h",
6570

6671
# node_lib
6772
"deps/node-10.15.3/src/async_wrap.cc",
@@ -130,26 +135,53 @@ LiquidCore enables Node.js virtual machines to run inside iOS apps. It provides
130135
"deps/node-10.15.3/src/node_crypto_bio.cc",
131136
"deps/node-10.15.3/src/node_crypto_clienthello.cc",
132137
"deps/node-10.15.3/src/tls_wrap.cc",
138+
"deps/node-10.15.3/src/**/*.h",
133139

134140
# V82JSC
135-
"LiquidCore/src/ios/V82JSC/**/*.cpp",
141+
"LiquidCore/src/ios/V82JSC/**/*.{cpp,h}",
136142
"deps/node-10.15.3/deps/v8/src/assert-scope.cc",
137143

138144
# generated files
139145
"LiquidCore/src/ios/gen/*.{c,cc}",
140146

141147
# LiquidCore node modifications
142-
"LiquidCore/src/common/*.{cc,c}",
143-
"LiquidCore/src/ios/node_bridge.cc",
148+
"LiquidCore/src/common/*.{cc,c,h}",
149+
"LiquidCore/src/ios/node_bridge.{cc,h}",
144150

145151
# API
146152
"LiquidCore/src/ios/LiquidCore/*.h",
147-
"LiquidCore/src/ios/API/*.m"
153+
"LiquidCore/src/ios/API/*.{m,h}"
148154

149155
cs.public_header_files = [ "LiquidCore/src/ios/LiquidCore/*.h" ]
156+
cs.private_header_files = [
157+
"deps/node-10.15.3/deps/v8/src/libplatform/worker-thread.h",
158+
"deps/node-10.15.3/deps/v8/include/libplatform/*.h",
159+
"deps/node-10.15.3/deps/v8/src/base/platform/platform*.h",
160+
"deps/node-10.15.3/deps/v8/src/base/compiler*.h",
161+
"deps/node-10.15.3/deps/v8/include/*.h",
162+
"deps/node-10.15.3/src/**/*.h",
163+
"LiquidCore/src/ios/V82JSC/**/*.h",
164+
"LiquidCore/src/common/*.h",
165+
"LiquidCore/src/ios/node_bridge.h",
166+
"LiquidCore/src/ios/API/*.h"
167+
]
168+
cs.preserve_paths = "deps/node-10.15.3/deps/v8/src/base/**/*.h",
169+
"deps/node-10.15.3/deps/v8/src/**/*.h",
170+
"deps/node-10.15.3/deps/v8/base/trace_event/common/trace_event_common.h",
171+
"deps/node-10.15.3/deps/v8/src/libplatform/*.h",
172+
"deps/node-10.15.3/deps/v8/src/libplatform/tracing/*.h",
173+
"deps/node-10.15.3/deps/v8/testing/gtest/include/gtest/gtest_prod.h",
174+
"deps/node-10.15.3/deps/v8/third_party/googletest/src/googletest/include/gtest/gtest_prod.h",
175+
"deps/node-10.15.3/src/node.cc",
176+
"deps/node-10.15.3/deps/v8/test/cctest/**/*.h",
177+
"LiquidCore/src/ios/torque-generated/*.h",
178+
"deps/Apple/**/*.h",
179+
"deps/utfcpp/**/*.h",
180+
"deps/JavaScriptCore/private/*.h"
150181
cs.frameworks = "JavaScriptCore"
151182
cs.xcconfig = {
152183
:HEADER_SEARCH_PATHS => [
184+
"${PODS_CONFIGURATION_BUILD_DIR}/LiquidCore-headers/LiquidCore_headers.framework/PrivateHeaders",
153185
"$(PODS_TARGET_SRCROOT)/deps/node-10.15.3/deps/v8/include",
154186
"${PODS_TARGET_SRCROOT}/deps/node-10.15.3/deps/v8",
155187
"$(PODS_TARGET_SRCROOT)/deps/node-10.15.3/deps/v8/src/libplatform",
@@ -274,9 +306,6 @@ LiquidCore enables Node.js virtual machines to run inside iOS apps. It provides
274306
]
275307
us.xcconfig = {
276308
:HEADER_SEARCH_PATHS => [
277-
# "$(PODS_TARGET_SRCROOT)/deps/node-10.15.3/deps/uv/include",
278-
# "$(PODS_TARGET_SRCROOT)/deps/node-10.15.3/deps/uv/src",
279-
# "$(PODS_TARGET_SRCROOT)/deps/node-10.15.3/deps/uv/src/unix",
280309
"${PODS_CONFIGURATION_BUILD_DIR}/LiquidCore-headers/LiquidCore_headers.framework/PrivateHeaders",
281310
].join(' '),
282311
:OTHER_CFLAGS => [
@@ -406,6 +435,7 @@ LiquidCore enables Node.js virtual machines to run inside iOS apps. It provides
406435
"deps/node-10.15.3/deps/nghttp2/lib/includes/nghttp2/*.h",
407436
"deps/node-10.15.3/deps/nghttp2/lib/*.h"
408437
]
438+
hs.preserve_paths = "deps/node-10.15.3/deps/nghttp2/lib/includes/config.h"
409439
hs.xcconfig = {
410440
:HEADER_SEARCH_PATHS => [
411441
"$(PODS_TARGET_SRCROOT)/deps/node-10.15.3/deps/nghttp2/lib/includes",
@@ -480,7 +510,26 @@ LiquidCore enables Node.js virtual machines to run inside iOS apps. It provides
480510
"deps/node-10.15.3/deps/openssl/openssl/crypto/threads_win.c",
481511
"deps/node-10.15.3/deps/openssl/openssl/crypto/uid.c",
482512
"deps/node-10.15.3/deps/openssl/openssl/crypto/ct/*.c",
483-
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/*.c",
513+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/cbc_cksm.c",
514+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/cbc_enc.c",
515+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/cfb64ede.c",
516+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/cfb64enc.c",
517+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/cfb_enc.c",
518+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/des_enc.c",
519+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/ecb3_enc.c",
520+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/ecb_enc.c",
521+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/fcrypt.c",
522+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/fcrypt_b.c",
523+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/ofb64ede.c",
524+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/ofb64enc.c",
525+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/ofb_enc.c",
526+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/pcbc_enc.c",
527+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/qud_cksm.c",
528+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/rand_key.c",
529+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/rpc_enc.c",
530+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/set_key.c",
531+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/str2key.c",
532+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/xcbc_enc.c",
484533
"deps/node-10.15.3/deps/openssl/openssl/crypto/dh/*.c",
485534
"deps/node-10.15.3/deps/openssl/openssl/crypto/dsa/*.c",
486535
"deps/node-10.15.3/deps/openssl/openssl/crypto/dso/*.c",
@@ -522,7 +571,61 @@ LiquidCore enables Node.js virtual machines to run inside iOS apps. It provides
522571
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/des_locl.h",
523572
"deps/node-10.15.3/deps/openssl/openssl/crypto/include/internal/cryptlib.h",
524573
"deps/node-10.15.3/deps/openssl/openssl/e_os.h",
525-
"deps/node-10.15.3/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslconf.h"
574+
"deps/node-10.15.3/deps/openssl/openssl/include/internal/*.h",
575+
"deps/node-10.15.3/deps/openssl/openssl/crypto/include/internal/*.h",
576+
"deps/node-10.15.3/deps/openssl/openssl/crypto/modes/modes_lcl.h",
577+
"deps/node-10.15.3/deps/openssl/openssl/crypto/asn1/*.h",
578+
"deps/node-10.15.3/deps/openssl/openssl/crypto/x509/x509_lcl.h",
579+
"deps/node-10.15.3/deps/openssl/openssl/crypto/whrlpool/wp_locl.h",
580+
"deps/node-10.15.3/deps/openssl/openssl/crypto/x509v3/*.h",
581+
"deps/node-10.15.3/deps/openssl/openssl/crypto/ocsp/*.h",
582+
"deps/node-10.15.3/deps/openssl/openssl/crypto/ui/ui_locl.h",
583+
"deps/node-10.15.3/deps/openssl/openssl/crypto/ts/ts_lcl.h",
584+
"deps/node-10.15.3/deps/openssl/openssl/ssl/ssl_locl.h",
585+
"deps/node-10.15.3/deps/openssl/openssl/crypto/engine/eng_int.h",
586+
"deps/node-10.15.3/deps/openssl/openssl/ssl/record/*.h",
587+
"deps/node-10.15.3/deps/openssl/openssl/ssl/statem/*.h",
588+
"deps/node-10.15.3/deps/openssl/openssl/ssl/*.h",
589+
"deps/node-10.15.3/deps/openssl/openssl/crypto/sha/sha_locl.h",
590+
"deps/node-10.15.3/deps/openssl/openssl/crypto/seed/seed_locl.h",
591+
"deps/node-10.15.3/deps/openssl/openssl/crypto/bn/*.h",
592+
"deps/node-10.15.3/deps/openssl/openssl/crypto/rsa/rsa_locl.h",
593+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/*.h",
594+
"deps/node-10.15.3/deps/openssl/openssl/crypto/ripemd/*.h",
595+
"deps/node-10.15.3/deps/openssl/openssl/crypto/rc2/rc2_locl.h",
596+
"deps/node-10.15.3/deps/openssl/openssl/crypto/rc4/rc4_locl.h",
597+
"deps/node-10.15.3/deps/openssl/openssl/crypto/rand/rand_lcl.h",
598+
"deps/node-10.15.3/deps/openssl/openssl/crypto/evp/evp_locl.h",
599+
"deps/node-10.15.3/deps/openssl/openssl/crypto/pkcs12/p12_lcl.h",
600+
"deps/node-10.15.3/deps/openssl/openssl/crypto/objects/*.h",
601+
"deps/node-10.15.3/deps/openssl/openssl/crypto/md5/md5_locl.h",
602+
"deps/node-10.15.3/deps/openssl/openssl/crypto/md4/md4_locl.h",
603+
"deps/node-10.15.3/deps/openssl/openssl/crypto/idea/idea_lcl.h",
604+
"deps/node-10.15.3/deps/openssl/openssl/crypto/lhash/lhash_lcl.h",
605+
"deps/node-10.15.3/deps/openssl/openssl/crypto/blake2/*.h",
606+
"deps/node-10.15.3/deps/openssl/openssl/crypto/hmac/hmac_lcl.h",
607+
"deps/node-10.15.3/deps/openssl/openssl/crypto/ec/ec_lcl.h",
608+
"deps/node-10.15.3/deps/openssl/openssl/crypto/dso/dso_locl.h",
609+
"deps/node-10.15.3/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/dso_conf.h",
610+
"deps/node-10.15.3/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/bn_conf.h",
611+
"deps/node-10.15.3/deps/openssl/openssl/crypto/dsa/dsa_locl.h",
612+
"deps/node-10.15.3/deps/openssl/openssl/crypto/dh/dh_locl.h",
613+
"deps/node-10.15.3/deps/openssl/openssl/crypto/ct/ct_locl.h",
614+
"deps/node-10.15.3/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h",
615+
"deps/node-10.15.3/deps/openssl/openssl/crypto/conf/*.h",
616+
"deps/node-10.15.3/deps/openssl/openssl/crypto/bio/*.h",
617+
"deps/node-10.15.3/deps/openssl/openssl/crypto/cast/*.h",
618+
"deps/node-10.15.3/deps/openssl/openssl/crypto/comp/*.h",
619+
"deps/node-10.15.3/deps/openssl/openssl/crypto/cms/*.h",
620+
"deps/node-10.15.3/deps/openssl/openssl/crypto/camellia/*.h",
621+
"deps/node-10.15.3/deps/openssl/openssl/crypto/bf/*.h",
622+
"deps/node-10.15.3/deps/openssl/openssl/crypto/async/async_locl.h",
623+
"deps/node-10.15.3/deps/openssl/openssl/crypto/async/arch/async_posix.h",
624+
"deps/node-10.15.3/deps/openssl/openssl/crypto/async/arch/async_null.h",
625+
"deps/node-10.15.3/deps/openssl/openssl/crypto/async/arch/async_win.h",
626+
"deps/node-10.15.3/deps/openssl/openssl/crypto/aes/aes_locl.h"
627+
os.preserve_paths = "deps/node-10.15.3/deps/openssl/openssl/crypto/LPdir_unix.c",
628+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/ncbc_enc.c"
526629
os.exclude_files = [
527630
"deps/node-10.15.3/deps/openssl/openssl/crypto/arm_arch.c",
528631
"deps/node-10.15.3/deps/openssl/openssl/crypto/ppc_arch.c",
@@ -534,20 +637,80 @@ LiquidCore enables Node.js virtual machines to run inside iOS apps. It provides
534637
"deps/node-10.15.3/deps/openssl/openssl/crypto/ec/ecp_nistz*.c",
535638
"deps/node-10.15.3/deps/openssl/openssl/crypto/aes/aes_x86core.c",
536639
"deps/node-10.15.3/deps/openssl/openssl/crypto/bf/bf_cbc.c",
537-
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/ncbc_enc.c",
538640
"deps/node-10.15.3/deps/openssl/openssl/crypto/rc2/tab.c",
641+
"deps/node-10.15.3/deps/openssl/openssl/include/internal/__DECC_INCLUDE_EPILOGUE.H",
642+
"deps/node-10.15.3/deps/openssl/openssl/include/internal/__DECC_INCLUDE_PROLOGUE.H",
643+
"deps/node-10.15.3/deps/openssl/openssl/crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H",
644+
"deps/node-10.15.3/deps/openssl/openssl/crypto/include/internal/__DECC_INCLUDE_PROLOGUE.H",
645+
"deps/node-10.15.3/deps/openssl/openssl/crypto/include/internal/dso_conf.h",
646+
"deps/node-10.15.3/deps/openssl/openssl/crypto/include/internal/bn_conf.h",
539647
]
540648
os.private_header_files = [
541649
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/des_locl.h",
542650
"deps/node-10.15.3/deps/openssl/openssl/crypto/include/internal/cryptlib.h",
543651
"deps/node-10.15.3/deps/openssl/openssl/e_os.h",
652+
"deps/node-10.15.3/deps/openssl/openssl/include/internal/*.h",
653+
"deps/node-10.15.3/deps/openssl/openssl/crypto/include/internal/*.h",
654+
"deps/node-10.15.3/deps/openssl/openssl/crypto/modes/modes_lcl.h",
655+
"deps/node-10.15.3/deps/openssl/openssl/crypto/asn1/*.h",
656+
"deps/node-10.15.3/deps/openssl/openssl/crypto/x509/x509_lcl.h",
657+
"deps/node-10.15.3/deps/openssl/openssl/crypto/whrlpool/wp_locl.h",
658+
"deps/node-10.15.3/deps/openssl/openssl/crypto/x509v3/*.h",
659+
"deps/node-10.15.3/deps/openssl/openssl/crypto/ocsp/*.h",
660+
"deps/node-10.15.3/deps/openssl/openssl/crypto/ui/ui_locl.h",
661+
"deps/node-10.15.3/deps/openssl/openssl/crypto/ts/ts_lcl.h",
662+
"deps/node-10.15.3/deps/openssl/openssl/ssl/ssl_locl.h",
663+
"deps/node-10.15.3/deps/openssl/openssl/crypto/engine/eng_int.h",
664+
"deps/node-10.15.3/deps/openssl/openssl/ssl/record/*.h",
665+
"deps/node-10.15.3/deps/openssl/openssl/ssl/statem/*.h",
666+
"deps/node-10.15.3/deps/openssl/openssl/ssl/*.h",
667+
"deps/node-10.15.3/deps/openssl/openssl/crypto/sha/sha_locl.h",
668+
"deps/node-10.15.3/deps/openssl/openssl/crypto/seed/seed_locl.h",
669+
"deps/node-10.15.3/deps/openssl/openssl/crypto/bn/*.h",
670+
"deps/node-10.15.3/deps/openssl/openssl/crypto/rsa/rsa_locl.h",
671+
"deps/node-10.15.3/deps/openssl/openssl/crypto/des/*.h",
672+
"deps/node-10.15.3/deps/openssl/openssl/crypto/ripemd/*.h",
673+
"deps/node-10.15.3/deps/openssl/openssl/crypto/rc2/rc2_locl.h",
674+
"deps/node-10.15.3/deps/openssl/openssl/crypto/rc4/rc4_locl.h",
675+
"deps/node-10.15.3/deps/openssl/openssl/crypto/rand/rand_lcl.h",
676+
"deps/node-10.15.3/deps/openssl/openssl/crypto/evp/evp_locl.h",
677+
"deps/node-10.15.3/deps/openssl/openssl/crypto/pkcs12/p12_lcl.h",
678+
"deps/node-10.15.3/deps/openssl/openssl/crypto/objects/*.h",
679+
"deps/node-10.15.3/deps/openssl/openssl/crypto/md5/md5_locl.h",
680+
"deps/node-10.15.3/deps/openssl/openssl/crypto/md4/md4_locl.h",
681+
"deps/node-10.15.3/deps/openssl/openssl/crypto/idea/idea_lcl.h",
682+
"deps/node-10.15.3/deps/openssl/openssl/crypto/lhash/lhash_lcl.h",
683+
"deps/node-10.15.3/deps/openssl/openssl/crypto/blake2/*.h",
684+
"deps/node-10.15.3/deps/openssl/openssl/crypto/hmac/hmac_lcl.h",
685+
"deps/node-10.15.3/deps/openssl/openssl/crypto/ec/ec_lcl.h",
686+
"deps/node-10.15.3/deps/openssl/openssl/crypto/dso/dso_locl.h",
687+
"deps/node-10.15.3/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/dso_conf.h",
688+
"deps/node-10.15.3/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/bn_conf.h",
689+
"deps/node-10.15.3/deps/openssl/openssl/crypto/dsa/dsa_locl.h",
690+
"deps/node-10.15.3/deps/openssl/openssl/crypto/dh/dh_locl.h",
691+
"deps/node-10.15.3/deps/openssl/openssl/crypto/ct/ct_locl.h",
692+
"deps/node-10.15.3/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h",
693+
"deps/node-10.15.3/deps/openssl/openssl/crypto/conf/*.h",
694+
"deps/node-10.15.3/deps/openssl/openssl/crypto/bio/*.h",
695+
"deps/node-10.15.3/deps/openssl/openssl/crypto/cast/*.h",
696+
"deps/node-10.15.3/deps/openssl/openssl/crypto/comp/*.h",
697+
"deps/node-10.15.3/deps/openssl/openssl/crypto/cms/*.h",
698+
"deps/node-10.15.3/deps/openssl/openssl/crypto/camellia/*.h",
699+
"deps/node-10.15.3/deps/openssl/openssl/crypto/bf/*.h",
700+
"deps/node-10.15.3/deps/openssl/openssl/crypto/async/async_locl.h",
701+
"deps/node-10.15.3/deps/openssl/openssl/crypto/async/arch/async_posix.h",
702+
"deps/node-10.15.3/deps/openssl/openssl/crypto/async/arch/async_null.h",
703+
"deps/node-10.15.3/deps/openssl/openssl/crypto/async/arch/async_win.h",
704+
"deps/node-10.15.3/deps/openssl/openssl/crypto/aes/aes_locl.h"
544705
]
545706
os.xcconfig = {
546707
# System Header Search Paths
547708
:HEADER_SEARCH_PATHS => [
709+
"${PODS_CONFIGURATION_BUILD_DIR}/LiquidCore-headers/LiquidCore_headers.framework/PrivateHeaders",
548710
"$(PODS_TARGET_SRCROOT)/deps/node-10.15.3/deps/openssl/openssl/crypto/include",
711+
"$(PODS_TARGET_SRCROOT)/deps/node-10.15.3/deps/openssl/openssl/include",
549712
"$(PODS_TARGET_SRCROOT)/deps/node-10.15.3/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto",
550-
"${PODS_CONFIGURATION_BUILD_DIR}/LiquidCore-headers/LiquidCore_headers.framework/PrivateHeaders",
713+
"$(PODS_TARGET_SRCROOT)/deps/node-10.15.3/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/include",
551714
].join(' '),
552715
:OTHER_CFLAGS => [
553716
'-DOPENSSL_NO_HW',

0 commit comments

Comments
 (0)