fbshipit-source-id: 2cd940396d650342920b28835f6e672febe6b55c

2018-06-12 03:39:09 -07:00
parent 1cc2d46be9
commit f7d487dd76
42 changed files with 1100 additions and 1080 deletions
--- a/iOS/third-party-podspecs/DoubleConversion.podspec
+++ b/iOS/third-party-podspecs/DoubleConversion.podspec
@@ -13,6 +13,6 @@ Pod::Spec.new do |spec|
  spec.libraries = "stdc++"
  spec.compiler_flags = '-std=c++1y'
  # Pinning to the same version as React.podspec.
-  spec.platforms = { :ios => "8.0" }
+  spec.platforms = { :ios => "8.0", :tvos => "9.2" }

 end
--- a/iOS/third-party-podspecs/EasyWSClient.podspec
+++ b/iOS/third-party-podspecs/EasyWSClient.podspec
@@ -0,0 +1,17 @@
+Pod::Spec.new do |spec|
+  spec.name = 'EasyWSClient'
+  spec.version = '1.0.0'
+  spec.license = { :type => 'MIT' }
+  spec.homepage = 'https://github.com/google/double-conversion'
+  spec.summary = 'Easywsclient is an easy and powerful WebSocket client to get your C++ code connected to a web stack right away.'
+  spec.authors = 'David Baird'
+  # spec.prepare_command = 'mv src double-conversion'
+  spec.source = { :git => 'https://github.com/dhbaird/easywsclient.git', :branch => 'master'}
+  spec.module_name = 'EasyWSClient'
+  spec.source_files = '*.{hpp,cpp}'
+  spec.libraries = "stdc++"
+  spec.compiler_flags = '-std=c++1y'
+  # Pinning to the same version as React.podspec.
+  spec.platforms = { :ios => "8.0", :tvos => "9.2" }
+
+end
--- a/iOS/third-party-podspecs/Folly.podspec
+++ b/iOS/third-party-podspecs/Folly.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
  spec.name = 'Folly'
-  spec.version = '2018.05.28.00'
+  spec.version = '2018.05.07.00'
  spec.license = { :type => 'Apache License, Version 2.0' }
  spec.homepage = 'https://github.com/facebook/folly'
  spec.summary = 'An open-source C++ library developed and used at Facebook.'
@@ -11,9 +11,7 @@ Pod::Spec.new do |spec|
  spec.dependency 'boost-for-react-native'
  spec.dependency 'DoubleConversion'
  spec.dependency 'glog'
-  spec.dependency 'OpenSSL-Static', '1.0.2.c1'
-  spec.dependency 'CocoaLibEvent', '~> 1.0'
-  spec.compiler_flags = '-DFOLLY_HAVE_PTHREAD=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_LIBGFLAGS=0 -DFOLLY_HAVE_LIBJEMALLOC=0 -DFOLLY_HAVE_PREADV=0 -DFOLLY_HAVE_PWRITEV=0 -DFOLLY_HAVE_TFO=0 -DFOLLY_USE_SYMBOLIZER=0  -frtti
+  spec.compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_LIBGFLAGS=0 -DFOLLY_HAVE_LIBJEMALLOC=0 -DFOLLY_HAVE_PREADV=0 -DFOLLY_HAVE_PWRITEV=0 -DFOLLY_HAVE_TFO=0 -DFOLLY_USE_SYMBOLIZER=0  -frtti
    -fexceptions
    -std=c++14
    -Wno-error
@@ -27,27 +25,10 @@ Pod::Spec.new do |spec|
                      'folly/memory/detail/MallocImpl.cpp',
                      'folly/String.cpp',
                      'folly/*.cpp',
-                      'folly/detail/*.cpp',
-                      'folly/hash/*.cpp',
-                      'folly/portability/*.cpp',
                      'folly/ScopeGuard.h',
                      'folly/lang/ColdClass.cpp',
                      'folly/lang/Assume.h',
-                      'folly/lang/Assume.cpp',
-                      'folly/io/async/*.cpp',
-                      'folly/io/async/ssl/*.cpp',
-                      'folly/io/*.cpp',
-                      'folly/synchronization/*.cpp',
-                      'folly/lang/*.cpp',
-                      'folly/memory/*.cpp',
-                      'folly/futures/*.cpp',
-                      'folly/futures/detail/*.cpp',
-                      'folly/experimental/hazptr/*.cpp',
-                      'folly/executors/*.cpp',
-                      'folly/concurrency/*.cpp',
-                      'folly/ssl/*.cpp',
-                      'folly/ssl/detail/*.cpp',
-                      'folly/system/*.cpp'
+                      'folly/lang/Assume.cpp'

  # workaround for https://github.com/facebook/react-native/issues/14326
  spec.preserve_paths = 'folly/*.h',
@@ -57,16 +38,16 @@ Pod::Spec.new do |spec|
                        'folly/detail/*.h',
                        'folly/hash/*.h',
                        'folly/memory/*.h',
-                        'folly/**/*.h',
-                        'folly/futures/detail/*.h',
-                        'folly/futures/*.h'
+                        'folly/**/*.h'

  spec.header_mappings_dir = 'folly'
  spec.header_dir = 'folly'
  spec.libraries           = "stdc++"
  spec.private_header_files = 'folly/portability/Stdlib.h',
-                              'folly/portability/Stdio.h'
-
+                              'folly/portability/Malloc.h',
+                              'folly/portability/Stdlib.h',
+                              'folly/portability/Stdio.h',
+                              'folly/portability/PThread.h'
  spec.public_header_files = 'folly/portability/Config.h',
                              'folly/Executor.h',
                              'folly/Function.h',
@@ -100,19 +81,15 @@ Pod::Spec.new do |spec|
                              'folly/FBString.h',
                              'folly/hash/Hash.h',
                              'folly/memory/Malloc.h',
-                              'folly/io/async/AsyncTimeout.h',
                              'folly/**/*.h',
                              'folly/memory/detail/MallocImpl.h',
                              'folly/String.h',
-                              'folly/*.h',
-                              'folly/portability/PThread.h',
-                              'folly/futures/*.h',
-                              'folly/futures/detail/*.h'
+                              'folly/*.h'

  spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++11",
                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\"" }

  # Pinning to the same version as React.podspec.
-  spec.platforms = { :ios => "8.0"}
+  spec.platforms = { :ios => "8.0", :tvos => "10.0" }
 end
--- a/iOS/third-party-podspecs/LibEvent.podspec
+++ b/iOS/third-party-podspecs/LibEvent.podspec
@@ -1,29 +0,0 @@
-Pod::Spec.new do |s|
-
-  s.name                  = "libevent"
-  s.version               = "1.0"
-  s.summary               = "Unofficial libevent mirror for Cocoapods"
-
-  s.description           = <<-DESC
-                             This is a binary distribution of the libevent library built for iOS.
-                             The library uses configure which makes it a bit tricky to cross compile.
-                             DESC
-
-  s.homepage              = "http://libevent.org/"
-  s.license               = "BSD"
-  s.authors               = { "liguangming" => "cute@liguangming.com" }
-  s.social_media_url      = "http://twitter.com/liguangming"
-  s.ios.deployment_target = "6.0"
-  s.source                = { :git => "https://github.com/cute/libevent.git", :tag => "1.0" }
-  s.header_dir            = "event2"
-  s.source_files          = "include/**/*.h"
-  s.ios.library           = "event"
-  s.preserve_paths        = "include", "lib"
-  s.requires_arc          = false
-  s.xcconfig              = {
-                                "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/libevent/include",
-                                "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/libevent/include/event2",
-                                "LIBRARY_SEARCH_PATHS" => "$(PODS_ROOT)/libevent/lib",
-                            }
-
-end
--- a/iOS/third-party-podspecs/PeerTalk.podspec
+++ b/iOS/third-party-podspecs/PeerTalk.podspec
@@ -1,19 +0,0 @@
-Pod::Spec.new do |spec|
-    spec.name     = 'PeerTalk'
-    spec.version  = '1.0.0'
-    spec.license  = { :type => 'MIT' }
-    spec.homepage = 'http://rsms.me/peertalk/'
-    spec.authors  = { 'Rasmus Andersson' => 'rasmus@notion.se' }
-    spec.summary  = 'iOS and OS X Cocoa library for communicating over USB and TCP.'
-
-    spec.source   = { :git => "https://github.com/rsms/PeerTalk.git", :branch => 'master' }
-    spec.source_files = 'peertalk/*.{h,m}'
-    spec.requires_arc = true
-    spec.ios.deployment_target = '8.4'
-    spec.osx.deployment_target = '10.10'
-
-   spec.description = "                    PeerTalk is a iOS and OS X Cocoa library for communicating over USB and TCP.\n\n                    Highlights:\n\n                    * Provides you with USB device attach/detach events and attached device's info\n                    * Can connect to TCP services on supported attached devices (e.g. an iPhone), bridging the communication over USB transport\n                    * Offers a higher-level API (PTChannel and PTProtocol) for convenient implementations.\n                    * Tested and designed for libdispatch (aka Grand Central Dispatch).\n"
-   spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
-                                "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"/**" }
-
-end
--- a/iOS/third-party-podspecs/RSocket.podspec
+++ b/iOS/third-party-podspecs/RSocket.podspec
@@ -1,53 +0,0 @@
-Pod::Spec.new do |spec|
-  spec.name = 'RSocket'
-  spec.version = '0.10.0'
-  spec.license = { :type => 'MIT' }
-  spec.homepage = 'https://github.com/rsocket/rsocket-cpp'
-  spec.summary = 'C++ implementation of RSocket'
-  spec.authors = 'Facebook'
-  spec.source = { :git => 'https://github.com/rsocket/rsocket-cpp.git', :branch => "master"}
-  spec.module_name = 'RSocket'
-  spec.source_files = 'rsocket/benchmarks/*',
-                      'rsocket/framing/*',
-                      'rsocket/internal/*',
-                      'rsocket/statemachine/*',
-                      'rsocket/transports/*',
-                      'rsocket/transports/**/*',
-                      'yarpl/observable/*',
-                      'yarpl/flowable/*',
-                      'rsocket/*'
-
-  spec.libraries = "stdc++"
-  spec.compiler_flags = '-std=c++1y'
-  spec.dependency 'Folly'
-  spec.compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_LIBGFLAGS=0 -DFOLLY_HAVE_LIBJEMALLOC=0 -DFOLLY_HAVE_PREADV=0 -DFOLLY_HAVE_PWRITEV=0 -DFOLLY_HAVE_TFO=0 -DFOLLY_USE_SYMBOLIZER=0  -frtti
-    -fexceptions
-    -std=c++14
-    -Wno-error
-    -Wno-unused-local-typedefs
-    -Wno-unused-variable
-    -Wno-sign-compare
-    -Wno-comment
-    -Wno-return-type
-    -Wno-global-constructors'
-  spec.preserve_paths = 'rsocket/benchmarks/*.h',
-                        'rsocket/framing/*.h',
-                        'rsocket/internal/*.h',
-                        'rsocket/statemachine/*.h',
-                        'rsocket/transports/*.h',
-                        'rsocket/*.h',
-                        'yarpl/flowable/*.h',
-                        'yarpl/observable/*.h',
-                        'yarpl/perf/*.h',
-                        'yarpl/single/*.h',
-                        'yarpl/utils/*.h',
-                        'yarpl/*.h',
-                        '**/*.h'
-  spec.header_mappings_dir = 'rsocket'
-  spec.header_dir = 'rsocket'
-  spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
-                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/DoubleConversion\"/**" }
-  spec.platforms = { :ios => "8.0" }
-
-end
--- a/iOS/third-party-podspecs/glog.podspec
+++ b/iOS/third-party-podspecs/glog.podspec
@@ -5,7 +5,7 @@ Pod::Spec.new do |spec|
  spec.homepage = 'https://github.com/google/glog'
  spec.summary = 'Google logging module'
  spec.authors = 'Google'
-  spec.prepare_command = "#!/bin/bash\nset -e\n\nPLATFORM_NAME=\"${PLATFORM_NAME:-iphoneos}\"\nCURRENT_ARCH=\"${CURRENT_ARCH:-armv7}\"\n\nexport CC=\"$(xcrun -find -sdk $PLATFORM_NAME cc) -arch $CURRENT_ARCH -isysroot $(xcrun -sdk $PLATFORM_NAME --show-sdk-path)\"\nexport CXX=\"$CC\"\n\n# Remove automake symlink if it exists\nif [ -h \"test-driver\" ]; then\n    rm test-driver\nfi\n\n./configure --host arm-apple-darwin\n\n# Fix build for tvOS\ncat << EOF >> src/config.h\n\n/* Add in so we have Apple Target Conditionals */\n#ifdef __APPLE__\n#include <TargetConditionals.h>\n#include <Availability.h>\n#endif\n\n/* Special configuration for AppleTVOS */\n#if TARGET_OS_TV\n#undef HAVE_SYSCALL_H\n#undef HAVE_SYS_SYSCALL_H\n#undef OS_MACOSX\n#endif\n\n/* Special configuration for ucontext */\n#undef HAVE_UCONTEXT_H\n#undef PC_FROM_UCONTEXT\n#if defined(__x86_64__)\n#define PC_FROM_UCONTEXT uc_mcontext->__ss.__rip\n#elif defined(__i386__)\n#define PC_FROM_UCONTEXT uc_mcontext->__ss.__eip\n#endif\nEOF"
+  spec.prepare_command = File.read("../scripts/ios-configure-glog.sh")
  spec.source = { :git => 'https://github.com/google/glog.git',
                  :tag => "v#{spec.version}" }
  spec.module_name = 'glog'
@@ -36,6 +36,6 @@ Pod::Spec.new do |spec|
                                }
  spec.compiler_flags = '-std=c++1y'
  spec.libraries           = "stdc++"
-  spec.platforms = { :ios => "8.0"}
+  spec.platforms = { :ios => "8.0", :tvos => "9.2" }

 end