Skip to content

Commit a86aa81

Browse files
author
Eric Lange
committed
LiquidCore-headers is back
Unfortunately, I could think of no way to get rid of it entirely. However, LiquidCore and LiquidCore-headers are now decoupled (not dependent on each other), which makes deployment easier.
1 parent f881cc0 commit a86aa81

4 files changed

Lines changed: 106 additions & 10 deletions

File tree

‎LiquidCore-headers.podspec‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
require "json"
2+
3+
lcpackage = JSON.parse(File.read(File.join(__dir__, "package.json")))
4+
version = lcpackage['version']
5+
6+
Pod::Spec.new do |s|
7+
s.name = "LiquidCore-headers"
8+
s.version = version
9+
s.summary = "Header include files for LiquidCore."
10+
s.description = <<-DESC
11+
Header include files for LiquidCore addons. To use in a native addon,
12+
add "${PODS_CONFIGURATION_BUILD_DIR}/LiquidCore-headers/LiquidCore_headers.framework/PrivateHeaders"
13+
to your header search path.
14+
DESC
15+
s.homepage = "https://github.com/LiquidPlayer/LiquidCore"
16+
s.license = {:type => "MIT", :file => "LICENSE.md"}
17+
s.author = {"Eric Lange" => "eric@flicket.tv"}
18+
s.platform = :ios, '11.0'
19+
s.source = {:git => "https://github.com/LiquidPlayer/LiquidCore.git", :tag => "#{s.version}"}
20+
s.prepare_command = <<-CMD
21+
bash LiquidCore/src/ios/copy_headers.sh
22+
CMD
23+
s.source_files =
24+
"LiquidCore/src/ios/gen/include/*.h",
25+
"LiquidCore/src/ios/gen/include/uv/*.h",
26+
"LiquidCore/src/ios/gen/include/uv/uv/errno.h",
27+
"LiquidCore/src/ios/gen/include/uv/uv/aix.h",
28+
"LiquidCore/src/ios/gen/include/uv/uv/android-ifaddrs.h",
29+
"LiquidCore/src/ios/gen/include/uv/uv/bsd.h",
30+
"LiquidCore/src/ios/gen/include/uv/uv/darwin.h",
31+
"LiquidCore/src/ios/gen/include/uv/uv/linux.h",
32+
"LiquidCore/src/ios/gen/include/uv/uv/os390.h",
33+
"LiquidCore/src/ios/gen/include/uv/uv/posix.h",
34+
"LiquidCore/src/ios/gen/include/uv/uv/stdint-msvc2008.h",
35+
"LiquidCore/src/ios/gen/include/uv/uv/sunos.h",
36+
"LiquidCore/src/ios/gen/include/uv/uv/threadpool.h",
37+
"LiquidCore/src/ios/gen/include/uv/uv/tree.h",
38+
"LiquidCore/src/ios/gen/include/uv/uv/unix.h",
39+
"LiquidCore/src/ios/gen/include/uv/uv/version.h",
40+
"LiquidCore/src/ios/gen/include/uv/uv/win.h",
41+
"LiquidCore/src/ios/gen/include/node/*.h",
42+
"LiquidCore/src/ios/gen/include/node/inspector/**/*.h",
43+
"LiquidCore/src/ios/gen/include/node/large_pages/**/*.h",
44+
"LiquidCore/src/ios/gen/include/node/tracing/**/*.h",
45+
"LiquidCore/src/ios/gen/include/v8/*.h",
46+
"LiquidCore/src/ios/gen/include/v8/libplatform/**/*.h",
47+
"LiquidCore/src/ios/gen/include/openssl/**/*.h",
48+
"LiquidCore/src/ios/gen/include/http_parser/*.h",
49+
"LiquidCore/src/ios/gen/include/nghttp2/*.h",
50+
"LiquidCore/src/ios/gen/include/cares/*.h",
51+
"LiquidCore/src/ios/header-dummy.cc"
52+
s.private_header_files = [
53+
"LiquidCore/src/ios/gen/include/*.h",
54+
"LiquidCore/src/ios/gen/include/uv/*.h",
55+
"LiquidCore/src/ios/gen/include/uv/uv/errno.h",
56+
"LiquidCore/src/ios/gen/include/uv/uv/aix.h",
57+
"LiquidCore/src/ios/gen/include/uv/uv/android-ifaddrs.h",
58+
"LiquidCore/src/ios/gen/include/uv/uv/bsd.h",
59+
"LiquidCore/src/ios/gen/include/uv/uv/darwin.h",
60+
"LiquidCore/src/ios/gen/include/uv/uv/linux.h",
61+
"LiquidCore/src/ios/gen/include/uv/uv/os390.h",
62+
"LiquidCore/src/ios/gen/include/uv/uv/posix.h",
63+
"LiquidCore/src/ios/gen/include/uv/uv/stdint-msvc2008.h",
64+
"LiquidCore/src/ios/gen/include/uv/uv/sunos.h",
65+
"LiquidCore/src/ios/gen/include/uv/uv/threadpool.h",
66+
"LiquidCore/src/ios/gen/include/uv/uv/tree.h",
67+
"LiquidCore/src/ios/gen/include/uv/uv/unix.h",
68+
"LiquidCore/src/ios/gen/include/uv/uv/version.h",
69+
"LiquidCore/src/ios/gen/include/uv/uv/win.h",
70+
"LiquidCore/src/ios/gen/include/node/*.h",
71+
"LiquidCore/src/ios/gen/include/node/inspector/**/*.h",
72+
"LiquidCore/src/ios/gen/include/node/large_pages/**/*.h",
73+
"LiquidCore/src/ios/gen/include/node/tracing/**/*.h",
74+
"LiquidCore/src/ios/gen/include/v8/*.h",
75+
"LiquidCore/src/ios/gen/include/v8/libplatform/**/*.h",
76+
"LiquidCore/src/ios/gen/include/openssl/**/*.h",
77+
"LiquidCore/src/ios/gen/include/http_parser/*.h",
78+
"LiquidCore/src/ios/gen/include/nghttp2/*.h",
79+
"LiquidCore/src/ios/gen/include/cares/*.h",
80+
]
81+
s.header_mappings_dir = "LiquidCore/src/ios/gen/include"
82+
s.preserve_paths = "LiquidCore/src/ios/gen/include/uv/uv/errno.h"
83+
s.xcconfig = {
84+
:CLANG_WARN_DOCUMENTATION_COMMENTS => 'NO',
85+
:GCC_WARN_UNUSED_FUNCTION => 'NO',
86+
:HEADER_SEARCH_PATHS => [
87+
"$(PODS_TARGET_SRCROOT)/LiquidCore/src/ios/gen/include",
88+
"$(PODS_TARGET_SRCROOT)/LiquidCore/src/ios/gen/include/uv",
89+
"$(PODS_TARGET_SRCROOT)/LiquidCore/src/ios/gen/include/v8",
90+
"$(PODS_TARGET_SRCROOT)/LiquidCore/src/ios/gen/include/cares",
91+
"$(PODS_TARGET_SRCROOT)/LiquidCore/src/ios/gen/include/http_parser",
92+
"$(PODS_TARGET_SRCROOT)/LiquidCore/src/ios/gen/include/nghttp2",
93+
"$(PODS_TARGET_SRCROOT)/LiquidCore/src/ios/gen/include/node",
94+
].join(' ')
95+
}
96+
end

‎LiquidCore.podspec‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ LiquidCore enables Node.js virtual machines to run inside iOS apps. It provides
318318
headers.preserve_paths = "LiquidCore/src/ios/gen/include/uv/uv/errno.h"
319319
headers.xcconfig = {
320320
:CLANG_WARN_DOCUMENTATION_COMMENTS => 'NO',
321+
:GCC_WARN_UNUSED_FUNCTION => 'NO',
321322
:HEADER_SEARCH_PATHS => [
322323
"$(PODS_TARGET_SRCROOT)/LiquidCore/src/ios/gen/include",
323324
"$(PODS_TARGET_SRCROOT)/LiquidCore/src/ios/gen/include/uv",
@@ -330,14 +331,6 @@ LiquidCore enables Node.js virtual machines to run inside iOS apps. It provides
330331
}
331332
end
332333

333-
s.subspec 'addon' do |addon|
334-
addon.dependency 'LiquidCore/headers'
335-
addon.source_files = "LiquidCore/src/ios/gen/include/uv/uv/errno.h"
336-
addon.private_header_files = [
337-
"LiquidCore/src/ios/gen/include/uv/uv/errno.h"
338-
]
339-
end
340-
341334
s.subspec 'uv' do |us|
342335
us.dependency 'LiquidCore/headers'
343336
us.source_files =

‎LiquidCore/src/ios/header-dummy.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "addon.h"
22

3-
void LiquidCoreHeader_dummy() {
3+
static void LiquidCoreHeader_dummy() {
44

55
}

‎package.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "liquidcore",
3-
"version": "0.7.6",
3+
"version": "0.7.7",
44
"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.",
55
"main": "index.js",
66
"bin": "lib/cli.js",
@@ -39,12 +39,19 @@
3939
"ios": [
4040
{
4141
"name": "LiquidCore"
42+
},
43+
{
44+
"name": "LiquidCore-headers"
4245
}
4346
],
4447
"ios-dev": [
4548
{
4649
"name": "LiquidCore",
4750
"path": "LiquidCore.podspec"
51+
},
52+
{
53+
"name": "LiquidCore-headers",
54+
"path": "LiquidCore-headers.podspec"
4855
}
4956
]
5057
},

0 commit comments

Comments
 (0)