iOS OSS: updated Podfile to have fabric related targets

Summary: Initial attempt to make fabric stuffs built properly with CocoaPods + RNTesterPods project. This simply includes fabric libs to the build, it doesn't change any behavior or enable fabric runtime. Reviewed By: shergin Differential Revision: D7626038 fbshipit-source-id: 4a80e0066cffa4478bb442fa8aefeaee6ff56ddd
2018-04-13 17:19:04 -07:00 · 2018-04-13 17:19:04 -07:00 · 2299d4cd7c
parent f569b45f4c
commit 2299d4cd7c
4 changed files with 101 additions and 5 deletions
--- a/RNTester/Podfile
+++ b/RNTester/Podfile
@ -15,6 +15,7 @@ target 'RNTester' do
    'RCTAnimation',
    'RCTBlob',
    'RCTCameraRoll',
+    'RCTFabric',
    'RCTGeolocation',
    'RCTImage',
    'RCTLinkingIOS',
--- a/RNTester/Podfile.lock
+++ b/RNTester/Podfile.lock
@ -14,6 +14,9 @@ PODS:
    - Folly (= 2016.10.31.00)
    - React/Core
    - React/cxxreact
+  - React/CxxExceptions (1000.0.0):
+    - React/CxxBridge
+    - React/exceptions
  - React/cxxreact (1000.0.0):
    - boost-for-react-native (= 1.63.0)
    - Folly (= 2016.10.31.00)
@ -22,6 +25,24 @@ PODS:
  - React/DevSupport (1000.0.0):
    - React/Core
    - React/RCTWebSocket
+  - React/exceptions (1000.0.0)
+  - React/fabric (1000.0.0):
+    - React/fabric/core (= 1000.0.0)
+    - React/fabric/debug (= 1000.0.0)
+    - React/fabric/graphics (= 1000.0.0)
+    - React/fabric/uimanager (= 1000.0.0)
+    - React/fabric/view (= 1000.0.0)
+  - React/fabric/core (1000.0.0):
+    - Folly (= 2016.10.31.00)
+  - React/fabric/debug (1000.0.0):
+    - Folly (= 2016.10.31.00)
+  - React/fabric/graphics (1000.0.0):
+    - Folly (= 2016.10.31.00)
+  - React/fabric/uimanager (1000.0.0):
+    - Folly (= 2016.10.31.00)
+  - React/fabric/view (1000.0.0):
+    - Folly (= 2016.10.31.00)
+    - yoga
  - React/fishhook (1000.0.0)
  - React/jschelpers (1000.0.0):
    - Folly (= 2016.10.31.00)
@ -37,6 +58,11 @@ PODS:
  - React/RCTCameraRoll (1000.0.0):
    - React/Core
    - React/RCTImage
+  - React/RCTFabric (1000.0.0):
+    - Folly (= 2016.10.31.00)
+    - React/Core
+    - React/CxxExceptions
+    - React/fabric
  - React/RCTGeolocation (1000.0.0):
    - React/Core
  - React/RCTImage (1000.0.0):
@ -72,6 +98,7 @@ DEPENDENCIES:
  - React/RCTAnimation (from `../`)
  - React/RCTBlob (from `../`)
  - React/RCTCameraRoll (from `../`)
+  - React/RCTFabric (from `../`)
  - React/RCTGeolocation (from `../`)
  - React/RCTImage (from `../`)
  - React/RCTLinkingIOS (from `../`)
@ -104,9 +131,9 @@ SPEC CHECKSUMS:
  DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c
  Folly: 9a8eea4725a0b6ba3256ebf206c21e352c23abf8
  glog: 1de0bb937dccdc981596d3b5825ebfb765017ded
-  React: 4e8050da47914f710f7bf48d1aca39fd9afafe39
+  React: e3382e39c51a5e5889248e97c6b9b1b3ca443a08
  yoga: bdd268c5812f00bdb52cc2b58f129797e97935eb

-PODFILE CHECKSUM: 2db1aae50ba1389ea02bbb867efcf85182b0336a
+PODFILE CHECKSUM: 1a96172007b66aa74825c234f17139dd9c3d3cd7

 COCOAPODS: 1.5.0
--- a/React.podspec
+++ b/React.podspec
@ -52,7 +52,7 @@ Pod::Spec.new do |s|
                              "React/Inspector/*",
                              "ReactCommon/yoga/*",
                              "React/Cxx*/*",
-                              "React/Fabric/**/*",
+                              "React/Fabric/**/*"
    ss.ios.exclude_files    = "React/**/RCTTV*.*"
    ss.tvos.exclude_files   = "React/Modules/RCTClipboard*",
                              "React/Views/RCTDatePicker*",
@ -79,7 +79,7 @@ Pod::Spec.new do |s|

  s.subspec "CxxExceptions" do |ss|
    ss.dependency             "React/CxxBridge"
-    ss.private_header_files = "React/CxxExceptions/*.h"
+    ss.dependency             "React/exceptions"
    ss.source_files         = "React/CxxExceptions/*.{h,m,mm}"
  end

@ -90,6 +90,19 @@ Pod::Spec.new do |s|
                              "React/Inspector/*"
  end

+  s.subspec "RCTFabric" do |ss|
+    ss.dependency             "Folly", folly_version
+    ss.dependency             "React/Core"
+    ss.dependency             "React/CxxExceptions"
+    ss.dependency             "React/fabric"
+    ss.compiler_flags       = folly_compiler_flags
+    ss.source_files         = "React/Fabric/**/*.{c,h,m,mm,S,cpp}"
+    ss.exclude_files        = "**/tests/*"
+    ss.header_dir           = "React"
+    ss.framework            = "JavaScriptCore"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
+  end
+
  s.subspec "tvOS" do |ss|
    ss.dependency             "React/Core"
    ss.source_files         = "React/**/RCTTV*.{h, m}"
@ -129,6 +142,61 @@ Pod::Spec.new do |s|
    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Folly\"" }
  end

+  s.subspec "exceptions" do |ss|
+    ss.source_files         = "ReactCommon/exceptions/*.{cpp,h}"
+    ss.header_dir           = "cxxreact"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
+  end
+
+  s.subspec "fabric" do |ss|
+    ss.subspec "core" do |sss|
+      sss.dependency             "Folly", folly_version
+      sss.compiler_flags       = folly_compiler_flags
+      sss.source_files         = "ReactCommon/fabric/core/**/*.{cpp,h}"
+      sss.exclude_files        = "**/tests/*"
+      sss.header_dir           = "fabric/core"
+      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }
+    end
+
+    ss.subspec "debug" do |sss|
+      sss.dependency             "Folly", folly_version
+      sss.compiler_flags       = folly_compiler_flags
+      sss.source_files         = "ReactCommon/fabric/debug/**/*.{cpp,h}"
+      sss.exclude_files        = "**/tests/*"
+      sss.header_dir           = "fabric/debug"
+      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }
+    end
+
+    ss.subspec "graphics" do |sss|
+      sss.dependency             "Folly", folly_version
+      sss.compiler_flags       = folly_compiler_flags
+      sss.source_files         = "ReactCommon/fabric/graphics/**/*.{cpp,h}"
+      sss.exclude_files        = "**/tests/*"
+      sss.header_dir           = "fabric/graphics"
+      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }
+    end
+
+    ss.subspec "uimanager" do |sss|
+      sss.dependency             "Folly", folly_version
+      sss.compiler_flags       = folly_compiler_flags
+      sss.source_files         = "ReactCommon/fabric/uimanager/**/*.{cpp,h}"
+      sss.exclude_files        = "**/tests/*"
+      sss.header_dir           = "fabric/uimanager"
+      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }
+    end
+
+    ss.subspec "view" do |sss|
+      sss.dependency             "Folly", folly_version
+      sss.dependency             "yoga"
+      sss.compiler_flags       = folly_compiler_flags
+      sss.source_files         = "ReactCommon/fabric/view/**/*.{cpp,h}"
+      sss.exclude_files        = "**/tests/*"
+      sss.header_dir           = "fabric/view"
+      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }
+    end
+
+  end
+
  s.subspec "ART" do |ss|
    ss.dependency             "React/Core"
    ss.source_files         = "Libraries/ART/**/*.{h,m}"
--- a/ReactCommon/fabric/uimanager/FabricUIManager.cpp
+++ b/ReactCommon/fabric/uimanager/FabricUIManager.cpp
@ -13,7 +13,7 @@
 #include <fabric/core/LayoutContext.h>
 #include <fabric/debug/DebugStringConvertible.h>
 #include <fabric/debug/DebugStringConvertibleItem.h>
-#include <fabric/view/ViewcomponentDescriptor.h>
+#include <fabric/view/ViewComponentDescriptor.h>
 #include <fabric/view/ViewProps.h>
 #include <fabric/view/ViewShadowNode.h>