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.
LiquidPlayer · Apr 13, 2020 · a86aa81 · a86aa81
1 parent f881cc0
commit a86aa81
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 10 deletions.
diff --git a/LiquidCore-headers.podspec b/LiquidCore-headers.podspec
@@ -0,0 +1,96 @@
+require "json"
+
+lcpackage = JSON.parse(File.read(File.join(__dir__, "package.json")))
+version = lcpackage['version']
+
+Pod::Spec.new do |s|
+  s.name = "LiquidCore-headers"
+  s.version = version
+  s.summary = "Header include files for LiquidCore."
+  s.description = <<-DESC
+    Header include files for LiquidCore addons.  To use in a native addon,
+    add "${PODS_CONFIGURATION_BUILD_DIR}/LiquidCore-headers/LiquidCore_headers.framework/PrivateHeaders"
+    to your header search path.
+  DESC
+  s.homepage = "https://github.com/LiquidPlayer/LiquidCore"
+  s.license = {:type => "MIT", :file => "LICENSE.md"}
+  s.author = {"Eric Lange" => "eric@flicket.tv"}
+  s.platform = :ios, '11.0'
+  s.source = {:git => "https://github.com/LiquidPlayer/LiquidCore.git", :tag => "#{s.version}"}
+  s.prepare_command = <<-CMD
+    bash LiquidCore/src/ios/copy_headers.sh
+  CMD
+  s.source_files =
+    "LiquidCore/src/ios/gen/include/*.h",
+    "LiquidCore/src/ios/gen/include/uv/*.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/errno.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/aix.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/android-ifaddrs.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/bsd.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/darwin.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/linux.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/os390.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/posix.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/stdint-msvc2008.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/sunos.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/threadpool.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/tree.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/unix.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/version.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/win.h",
+    "LiquidCore/src/ios/gen/include/node/*.h",
+    "LiquidCore/src/ios/gen/include/node/inspector/**/*.h",
+    "LiquidCore/src/ios/gen/include/node/large_pages/**/*.h",
+    "LiquidCore/src/ios/gen/include/node/tracing/**/*.h",
+    "LiquidCore/src/ios/gen/include/v8/*.h",
+    "LiquidCore/src/ios/gen/include/v8/libplatform/**/*.h",
+    "LiquidCore/src/ios/gen/include/openssl/**/*.h",
+    "LiquidCore/src/ios/gen/include/http_parser/*.h",
+    "LiquidCore/src/ios/gen/include/nghttp2/*.h",
+    "LiquidCore/src/ios/gen/include/cares/*.h",
+    "LiquidCore/src/ios/header-dummy.cc"
+  s.private_header_files = [
+    "LiquidCore/src/ios/gen/include/*.h",
+    "LiquidCore/src/ios/gen/include/uv/*.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/errno.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/aix.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/android-ifaddrs.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/bsd.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/darwin.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/linux.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/os390.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/posix.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/stdint-msvc2008.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/sunos.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/threadpool.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/tree.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/unix.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/version.h",
+    "LiquidCore/src/ios/gen/include/uv/uv/win.h",
+    "LiquidCore/src/ios/gen/include/node/*.h",
+    "LiquidCore/src/ios/gen/include/node/inspector/**/*.h",
+    "LiquidCore/src/ios/gen/include/node/large_pages/**/*.h",
+    "LiquidCore/src/ios/gen/include/node/tracing/**/*.h",
+    "LiquidCore/src/ios/gen/include/v8/*.h",
+    "LiquidCore/src/ios/gen/include/v8/libplatform/**/*.h",
+    "LiquidCore/src/ios/gen/include/openssl/**/*.h",
+    "LiquidCore/src/ios/gen/include/http_parser/*.h",
+    "LiquidCore/src/ios/gen/include/nghttp2/*.h",
+    "LiquidCore/src/ios/gen/include/cares/*.h",
+  ]
+  s.header_mappings_dir = "LiquidCore/src/ios/gen/include"
+  s.preserve_paths = "LiquidCore/src/ios/gen/include/uv/uv/errno.h"
+  s.xcconfig = {
+    :CLANG_WARN_DOCUMENTATION_COMMENTS => 'NO',
+    :GCC_WARN_UNUSED_FUNCTION => 'NO',
+    :HEADER_SEARCH_PATHS => [
+      "$(PODS_TARGET_SRCROOT)/LiquidCore/src/ios/gen/include",
+      "$(PODS_TARGET_SRCROOT)/LiquidCore/src/ios/gen/include/uv",
+      "$(PODS_TARGET_SRCROOT)/LiquidCore/src/ios/gen/include/v8",
+      "$(PODS_TARGET_SRCROOT)/LiquidCore/src/ios/gen/include/cares",
+      "$(PODS_TARGET_SRCROOT)/LiquidCore/src/ios/gen/include/http_parser",
+      "$(PODS_TARGET_SRCROOT)/LiquidCore/src/ios/gen/include/nghttp2",
+      "$(PODS_TARGET_SRCROOT)/LiquidCore/src/ios/gen/include/node",
+    ].join(' ')
+  }
+end
diff --git a/LiquidCore.podspec b/LiquidCore.podspec
@@ -318,6 +318,7 @@ LiquidCore enables Node.js virtual machines to run inside iOS apps. It provides
     headers.preserve_paths = "LiquidCore/src/ios/gen/include/uv/uv/errno.h"
     headers.xcconfig = {
       :CLANG_WARN_DOCUMENTATION_COMMENTS => 'NO',
+      :GCC_WARN_UNUSED_FUNCTION => 'NO',
       :HEADER_SEARCH_PATHS => [
         "$(PODS_TARGET_SRCROOT)/LiquidCore/src/ios/gen/include",
         "$(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
     }
   end
 
-  s.subspec 'addon' do |addon|
-    addon.dependency 'LiquidCore/headers'
-    addon.source_files = "LiquidCore/src/ios/gen/include/uv/uv/errno.h"
-    addon.private_header_files = [
-      "LiquidCore/src/ios/gen/include/uv/uv/errno.h"
-    ]
-  end
-
   s.subspec 'uv' do |us|
     us.dependency 'LiquidCore/headers'
     us.source_files =

diff --git a/LiquidCore/src/ios/header-dummy.cc b/LiquidCore/src/ios/header-dummy.cc
@@ -1,5 +1,5 @@
 #include "addon.h"
 
-void LiquidCoreHeader_dummy() {
+static void LiquidCoreHeader_dummy() {
 
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "liquidcore",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "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",
   "bin": "lib/cli.js",
@@ -39,12 +39,19 @@
     "ios": [
       {
         "name": "LiquidCore"
+      },
+      {
+        "name": "LiquidCore-headers"
       }
     ],
     "ios-dev": [
       {
         "name": "LiquidCore",
         "path": "LiquidCore.podspec"
+      },
+      {
+        "name": "LiquidCore-headers",
+        "path": "LiquidCore-headers.podspec"
       }
     ]
   },